Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[7979] trunk
|
From: <tu...@us...> - 2018-02-23 06:08:25
|
Revision: 7979
http://sourceforge.net/p/web-erp/reponame/7979
Author: turbopt
Date: 2018-02-23 06:08:16 +0000 (Fri, 23 Feb 2018)
Log Message:
-----------
Tim (PaulT add table tags/commit): Add Tim's improved SortSelect() js function replacement. Change also requires <thead>, <tbody>, and (if needed) <tfoot> tags applied to tables that have sorting. (Forum contribution: http://www.weberp.org/forum/showthread.php?tid=7918) Also, change removes the 'alt' attribute from date inputs (handling replaced by commit 7974) within these modified files.
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/AccountSections.php
trunk/AgedControlledInventory.php
trunk/BankMatching.php
trunk/CollectiveWorkOrderCost.php
trunk/CustItem.php
trunk/CustomerBalancesMovement.php
trunk/CustomerBranches.php
trunk/CustomerTypes.php
trunk/Dashboard.php
trunk/FixedAssetLocations.php
trunk/GLAccounts.php
trunk/ImportBankTransAnalysis.php
trunk/InternalStockRequest.php
trunk/InternalStockRequestInquiry.php
trunk/Locations.php
trunk/PO_AuthoriseMyOrders.php
trunk/PO_Header.php
trunk/PO_Items.php
trunk/PO_SelectOSPurchOrder.php
trunk/PaymentMethods.php
trunk/Prices.php
trunk/PricesByCost.php
trunk/ProductSpecs.php
trunk/PurchData.php
trunk/PurchaseByPrefSupplier.php
trunk/QATests.php
trunk/RelatedItemsUpdate.php
trunk/SalesCategories.php
trunk/SalesTypes.php
trunk/SelectCustomer.php
trunk/SelectOrderItems.php
trunk/SelectProduct.php
trunk/SelectQASamples.php
trunk/SelectSalesOrder.php
trunk/SelectSupplier.php
trunk/SelectWorkOrder.php
trunk/StockCategories.php
trunk/StockReorderLevel.php
trunk/StockStatus.php
trunk/StockTransfers.php
trunk/StockUsage.php
trunk/SuppContractChgs.php
trunk/SuppCreditGRNs.php
trunk/SuppFixedAssetChgs.php
trunk/SuppPriceList.php
trunk/SuppTransGLAnalysis.php
trunk/SupplierAllocations.php
trunk/SupplierContacts.php
trunk/SupplierGRNAndInvoiceInquiry.php
trunk/SupplierInquiry.php
trunk/SupplierPriceList.php
trunk/SupplierTenderCreate.php
trunk/SupplierTypes.php
trunk/TaxAuthorities.php
trunk/TaxAuthorityRates.php
trunk/TaxCategories.php
trunk/TaxGroups.php
trunk/TaxProvinces.php
trunk/TopItems.php
trunk/UnitsOfMeasure.php
trunk/WWW_Users.php
trunk/WhereUsedInquiry.php
trunk/WorkCentres.php
trunk/WorkOrderEntry.php
trunk/doc/Change.log
trunk/javascripts/MiscFunctions.js
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/AccountGroups.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -281,14 +281,17 @@
echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" />' . ' ' . $Title . '</p><br />';
echo '<table class="selection">
- <tr>
- <th class="ascending">' . _('Group Name') . '</th>
- <th class="ascending">' . _('Section') . '</th>
- <th class="ascending">' . _('Sequence In TB') . '</th>
- <th class="ascending">' . _('Profit and Loss') . '</th>
- <th class="ascending">' . _('Parent Group') . '</th>
- <th class="noprint" colspan="2"> </th>
- </tr>';
+ <thead>
+ <tr>
+ <th class="ascending">' . _('Group Name') . '</th>
+ <th class="ascending">' . _('Section') . '</th>
+ <th class="ascending">' . _('Sequence In TB') . '</th>
+ <th class="ascending">' . _('Profit and Loss') . '</th>
+ <th class="ascending">' . _('Parent Group') . '</th>
+ <th class="noprint" colspan="2"> </th>
+ </tr>
+ </thead>
+ <tbody>';
while($myrow = DB_fetch_array($result)) {
@@ -314,7 +317,8 @@
echo '<td class="noprint"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?SelectedAccountGroup=' . urlencode($myrow['groupname']), ENT_QUOTES,'UTF-8') . '&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this account group?') . '\');">' . _('Delete') . '</a></td></tr>';
} //END WHILE LIST LOOP
- echo '</table>';
+ echo '</tbody>
+ </table>';
} //end of ifs and buts!
Modified: trunk/AccountSections.php
===================================================================
--- trunk/AccountSections.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/AccountSections.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -166,7 +166,7 @@
$ErrMsg = _('Could not get account group sections because');
$result = DB_query($sql,$ErrMsg);
-/* echo '<div id="Report">';// Division to identify the report block.*/
+
echo '<p class="page_title_text"><img alt="" class="noprint" src="', $RootPath, '/css/', $Theme,
'/images/maintenance.png" title="', // Icon image.
_('Account Sections'), '" /> ', // Icon title.
@@ -174,11 +174,14 @@
echo '<br />
<table class="selection">
+ <thead>
<tr>
<th class="ascending">', _('Section Number'), '</th>
<th class="ascending">', _('Section Description'), '</th>
<th class="noprint" colspan="2"> </th>
- </tr>';
+ </tr>
+ </thead>
+ <tbody>';
while ($myrow = DB_fetch_array($result)) {
@@ -195,8 +198,8 @@
echo '</td>
</tr>';
} //END WHILE LIST LOOP
- echo '</table>';
-/* echo '</div>';// End div id="Report".*/
+ echo '</tbody>
+ </table>';
} //end of ifs and buts!
Modified: trunk/AgedControlledInventory.php
===================================================================
--- trunk/AgedControlledInventory.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/AgedControlledInventory.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -45,16 +45,19 @@
$TotalVal=0;
echo '<table>
- <tr>
- <th class="ascending">', _('Stock'), '</th>
- <th class="ascending">', _('Description'), '</th>
- <th class="ascending">', _('Batch'), '</th>
- <th class="ascending">', _('Quantity Remaining'), '</th>
- <th class="ascending">', _('Units'), '</th>
- <th class="ascending">', _('Inventory Value'), '</th>
- <th class="ascending">', _('Date'), '</th>
- <th class="ascending">', _('Days Old'), '</th>
- </tr>';
+ <thead>
+ <tr>
+ <th class="ascending">', _('Stock'), '</th>
+ <th class="ascending">', _('Description'), '</th>
+ <th class="ascending">', _('Batch'), '</th>
+ <th class="ascending">', _('Quantity Remaining'), '</th>
+ <th class="ascending">', _('Units'), '</th>
+ <th class="ascending">', _('Inventory Value'), '</th>
+ <th class="ascending">', _('Date'), '</th>
+ <th class="ascending">', _('Days Old'), '</th>
+ </tr>
+ </thead>
+ <tbody>';
while ($LocQtyRow=DB_fetch_array($LocStockResult)) {
@@ -88,7 +91,8 @@
);
} //while
-echo '<tfoot>
+echo '</tbody>
+ <tfoot>
<tr class="striped_row">
<td colspan="3"><b>', _('Total'), '</b></td>
<td class="number"><b>', locale_number_format($TotalQty,2), '</b></td>
Modified: trunk/BankMatching.php
===================================================================
--- trunk/BankMatching.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/BankMatching.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -130,12 +130,12 @@
// Change to allow input of FROM DATE and then TO DATE, instead of previous back-to-front method, add datepicker
echo '<tr>
<td>' . _('Show') . ' ' . $TypeName . ' ' . _('from') . ':</td>
- <td><input tabindex="3" type="text" name="AfterDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" size="12" maxlength="10" required="required" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_POST['AfterDate'] . '" /></td>
+ <td><input tabindex="3" type="text" name="AfterDate" class="date" size="12" maxlength="10" required="required" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_POST['AfterDate'] . '" /></td>
</tr>';
echo '<tr>
<td>' . _('to') . ':</td>
- <td><input tabindex="2" type="text" name="BeforeDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" size="12" maxlength="10" required="required" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_POST['BeforeDate'] . '" /></td>
+ <td><input tabindex="2" type="text" name="BeforeDate" class="date" size="12" maxlength="10" required="required" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_POST['BeforeDate'] . '" /></td>
</tr>';
echo '<tr>
<td colspan="3">' . _('Choose outstanding') . ' ' . $TypeName . ' ' . _('only or all') . ' ' . $TypeName . ' ' . _('in the date range') . ':</td>
@@ -275,15 +275,18 @@
$PaymentsResult = DB_query($sql, $ErrMsg);
echo '<table cellpadding="2" class="selection">
- <tr>
- <th class="ascending">' . _('Cheque No') . '</th>
- <th class="ascending">' . _('Ref') . '</th>
- <th class="ascending">' . _('Date') . '</th>
- <th class="ascending">' . $TypeName . '</th>
- <th class="ascending">' . _('Amount') . '</th>
- <th class="ascending">' . _('Outstanding') . '</th>
- <th colspan="3">' . _('Clear') . ' / ' . _('Unclear') . '</th>
- </tr>';
+ <thead>
+ <tr>
+ <th class="ascending">' . _('Cheque No') . '</th>
+ <th class="ascending">' . _('Ref') . '</th>
+ <th class="ascending">' . _('Date') . '</th>
+ <th class="ascending">' . $TypeName . '</th>
+ <th class="ascending">' . _('Amount') . '</th>
+ <th class="ascending">' . _('Outstanding') . '</th>
+ <th colspan="3">' . _('Clear') . ' / ' . _('Unclear') . '</th>
+ </tr>
+ </thead>
+ <tbody>';
$i = 1; //no of rows counter
@@ -336,7 +339,8 @@
$i++;
}
//end of while loop
- echo '</table>
+ echo '</tbody>
+ </table>
<br />
<div class="centre">
<input type="hidden" name="RowCounter" value="' . $i . '" />
Modified: trunk/CollectiveWorkOrderCost.php
===================================================================
--- trunk/CollectiveWorkOrderCost.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/CollectiveWorkOrderCost.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -49,13 +49,17 @@
$result = DB_query($sql,$ErrMsg);
if (DB_num_rows($result)>0) {
echo '<table class="selection">
- <tr><th class="ascending">' . _('Item') . '</th>
- <th>' . _('Description') . '</th>
- <th class="ascending">' . _('Date Issued') . '</th>
- <th class="ascending">' . _('Issued Qty') . '</th>
- <th class="ascending">' . _('Issued Cost') . '</th>
- <th class="ascending">' . _('Work Order') . '</th>
- </tr>';
+ <thead>
+ <tr>
+ <th class="ascending">' . _('Item') . '</th>
+ <th>' . _('Description') . '</th>
+ <th class="ascending">' . _('Date Issued') . '</th>
+ <th class="ascending">' . _('Issued Qty') . '</th>
+ <th class="ascending">' . _('Issued Cost') . '</th>
+ <th class="ascending">' . _('Work Order') . '</th>
+ </tr>
+ </thead>
+ <tbody>';
$TotalCost = 0;
while ($myrow = DB_fetch_array($result)){
@@ -71,9 +75,14 @@
<td>' . $myrow['reference'] . '</td>
</tr>';
}
- echo '<tr><td colspan="4"><b>' . _('Total Cost') . '</b></td>
- <td colspan="2"><b>' .locale_number_format($TotalCost,2) . '</b></td>
- </tr></table>';
+ echo '</tbody>
+ <tfoot>
+ <tr>
+ <td colspan="4"><b>' . _('Total Cost') . '</b></td>
+ <td colspan="2"><b>' .locale_number_format($TotalCost,2) . '</b></td>
+ </tr>
+ </tfoot>
+ </table>';
} else {
prnMsg(_('There are no data available'),'error');
include('includes/footer.php');
@@ -265,9 +274,9 @@
</td>
</tr>
<tr>
- <td colspan="2">' . _('Start Date From') . ':<input type="text" name="DateFrom" value="' . $_POST['DateFrom'] . '" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" />
+ <td colspan="2">' . _('Start Date From') . ':<input type="text" name="DateFrom" value="' . $_POST['DateFrom'] . '" class="date" />
- ' . _('Start Date To') . ':<input type="text" name="DateTo" value="' . $_POST['DateTo'] . '" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" />
+ ' . _('Start Date To') . ':<input type="text" name="DateTo" value="' . $_POST['DateTo'] . '" class="date" />
</td>
</tr>
</table>';
@@ -314,12 +323,15 @@
echo '<br />
<table cellpadding="2" class="selection">
- <tr>
- <th class="ascending">' . _('Code') . '</th>
- <th class="ascending">' . _('Description') . '</th>
- <th class="ascending">' . _('On Hand') . '</th>
- <th>' . _('Units') . '</th>
- </tr>';
+ <thead>
+ <tr>
+ <th class="ascending">' . _('Code') . '</th>
+ <th class="ascending">' . _('Description') . '</th>
+ <th class="ascending">' . _('On Hand') . '</th>
+ <th>' . _('Units') . '</th>
+ </tr>
+ </thead>
+ <tbody>';
while ($myrow=DB_fetch_array($StockItemsResult)) {
@@ -335,7 +347,8 @@
$myrow['units']);
}//end of while loop
- echo '</table>';
+ echo '</tbody>
+ </table>';
}
//end if stock search results to show
else {
@@ -427,21 +440,24 @@
<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post" id="wos">
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table cellpadding="2" width="95%" class="selection">
- <tr>
- <th>' . _('Select') . '</th>
- <th>' . _('Modify') . '</th>
- <th class="ascending">' . _('Status') . '</th>
- <th>' . _('Issue To') . '</th>
- <th>' . _('Receive') . '</th>
- <th>' . _('Costing') . '</th>
- <th>' . _('Paperwork') . '</th>
- <th class="ascending">' . _('Item') . '</th>
- <th class="ascending">' . _('Quantity Required') . '</th>
- <th class="ascending">' . _('Quantity Received') . '</th>
- <th class="ascending">' . _('Quantity Outstanding') . '</th>
- <th class="ascending">' . _('Start Date') . '</th>
- <th class="ascending">' . _('Required Date') . '</th>
- </tr>';
+ <thead>
+ <tr>
+ <th>' . _('Select') . '</th>
+ <th>' . _('Modify') . '</th>
+ <th class="ascending">' . _('Status') . '</th>
+ <th>' . _('Issue To') . '</th>
+ <th>' . _('Receive') . '</th>
+ <th>' . _('Costing') . '</th>
+ <th>' . _('Paperwork') . '</th>
+ <th class="ascending">' . _('Item') . '</th>
+ <th class="ascending">' . _('Quantity Required') . '</th>
+ <th class="ascending">' . _('Quantity Received') . '</th>
+ <th class="ascending">' . _('Quantity Outstanding') . '</th>
+ <th class="ascending">' . _('Start Date') . '</th>
+ <th class="ascending">' . _('Required Date') . '</th>
+ </tr>
+ </thead>
+ <tbody>';
while ($myrow=DB_fetch_array($WorkOrdersResult)) {
@@ -490,7 +506,8 @@
}
//end of while loop
- echo '</table>
+ echo '</tbody>
+ </table>
<div class="centre">
<input type="submit" value="' . _('Submit') . '" name="Submit" />
</form>';
Modified: trunk/CustItem.php
===================================================================
--- trunk/CustItem.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/CustItem.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -139,17 +139,18 @@
$NoCustItemData=1;
} else if ($StockID != '') {
- echo '<table cellpadding="2" class="selection">';
- $TableHeader = '<tr>
- <th class="ascending">' . _('Customer') . '</th>
- <th>' . _('Customer Unit') . '</th>
- <th>' . _('Conversion Factor') . '</th>
- <th class="ascending">' . _('Customer Item') . '</th>
- <th class="ascending">' . _('Customer Description') . '</th>
+ echo '<table cellpadding="2" class="selection">
+ <thead>
+ <tr>
+ <th class="ascending">' . _('Customer') . '</th>
+ <th>' . _('Customer Unit') . '</th>
+ <th>' . _('Conversion Factor') . '</th>
+ <th class="ascending">' . _('Customer Item') . '</th>
+ <th class="ascending">' . _('Customer Description') . '</th>
+ </tr>
+ </thead>
+ <tbody>';
- </tr>';
- echo $TableHeader;
-
while ($myrow = DB_fetch_array($custitemResult)) {
printf('<tr class="striped_row">
<td>%s</td>
@@ -172,7 +173,8 @@
$StockID,
$myrow['debtorno']);
} //end of while loop
- echo '</table><br/>';
+ echo '</tbody>
+ </table><br/>';
} // end of there are rows to show
echo '<br/>';
} /* Only show the existing records if one is not being edited */
@@ -285,17 +287,19 @@
$StockUOM = 'each';
}
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post">
- <table cellpadding="2" colspan="7" class="selection">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- $TableHeader = '<tr>
- <th class="ascending">' . _('Code') . '</th>
- <th class="ascending">' . _('Customer Name') . '</th>
- <th class="ascending">' . _('Currency') . '</th>
- <th class="ascending">' . _('Address 1') . '</th>
- <th class="ascending">' . _('Address 2') . '</th>
- <th class="ascending">' . _('Address 3') . '</th>
- </tr>';
- echo $TableHeader;
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <table cellpadding="2" colspan="7" class="selection">
+ <thead>
+ <tr>
+ <th class="ascending">' . _('Code') . '</th>
+ <th class="ascending">' . _('Customer Name') . '</th>
+ <th class="ascending">' . _('Currency') . '</th>
+ <th class="ascending">' . _('Address 1') . '</th>
+ <th class="ascending">' . _('Address 2') . '</th>
+ <th class="ascending">' . _('Address 3') . '</th>
+ </tr>
+ </thead>
+ <tbody>';
while ($myrow = DB_fetch_array($debtorsmasterResult)) {
printf('<tr class="striped_row">
@@ -318,7 +322,8 @@
}
//end of while loop
- echo '</table>
+ echo '</tbody>
+ </table>
<br/>
</form>';
}
Modified: trunk/CustomerBalancesMovement.php
===================================================================
--- trunk/CustomerBalancesMovement.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/CustomerBalancesMovement.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -56,11 +56,11 @@
</tr>
<tr>
<td>' . _('Date From') . ':</td>
- <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="FromDate" maxlength="10" size="11" value="' . Date($_SESSION['DefaultDateFormat'], Mktime(0, 0, 0, Date('m') - $_SESSION['NumberOfMonthMustBeShown'], Date('d'), Date('Y'))) . '" /></td>
+ <td><input type="text" class="date" name="FromDate" maxlength="10" size="11" value="' . Date($_SESSION['DefaultDateFormat'], Mktime(0, 0, 0, Date('m') - $_SESSION['NumberOfMonthMustBeShown'], Date('d'), Date('Y'))) . '" /></td>
</tr>
<tr>
<td>' . _('Date To') . ':</td>
- <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="ToDate" maxlength="10" size="11" value="' . Date($_SESSION['DefaultDateFormat']) . '" /></td>
+ <td><input type="text" class="date" name="ToDate" maxlength="10" size="11" value="' . Date($_SESSION['DefaultDateFormat']) . '" /></td>
</tr>
<tr>
<td>' . _('Create CSV') . ':</td>
@@ -111,6 +111,7 @@
if (!isset($_POST['CreateCSV'])){
echo '<table>
+ <thead>
<tr>
<th class="ascending">' . _('Customer') . ' </th>
<th class="ascending">' . _('Opening Balance') . '</th>
@@ -117,7 +118,9 @@
<th class="ascending">' . _('Debits') . '</th>
<th class="ascending">' . _('Credits') . '</th>
<th class="ascending">' . _('Balance') . '</th>
- </tr>';
+ </tr>
+ </thead>
+ <tbody>';
} else {
$CSVFile = '"' . _('Customer') . '","' . _('Opening Balance') . '","' . _('Debits') . '", "' . _('Credits') . '","' . _('Balance') . '"' . "\n";
}
@@ -185,7 +188,7 @@
}
if (!isset($_POST['CreateCSV'])){
- echo '</table>';
+ echo '</tbody></table>';
}
if ($_POST['Customer']==''){ //if there could be several customers being reported
if (!isset($_POST['CreateCSV'])){
Modified: trunk/CustomerBranches.php
===================================================================
--- trunk/CustomerBranches.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/CustomerBranches.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -397,18 +397,21 @@
_('Customer'), '" /> ',// Icon title.
_('Branches defined for'), ' ', $DebtorNo, ' - ', $myrow[0], '</p>';// Page title.
echo '<table class="selection">
- <tr>
- <th class="ascending">' . _('Code') . '</th>
- <th class="ascending">' . _('Name') . '</th>
- <th class="ascending">' . _('Branch Contact') . '</th>
- <th class="ascending">' . _('Salesman') . '</th>
- <th class="ascending">' . _('Area') . '</th>
- <th class="ascending">' . _('Phone No') . '</th>
- <th class="ascending">' . _('Fax No') . '</th>
- <th class="ascending">' . _('Email') . '</th>
- <th class="ascending">' . _('Tax Group') . '</th>
- <th class="ascending">' . _('Enabled?') . '</th>
- </tr>';
+ <thead>
+ <tr>
+ <th class="ascending">' . _('Code') . '</th>
+ <th class="ascending">' . _('Name') . '</th>
+ <th class="ascending">' . _('Branch Contact') . '</th>
+ <th class="ascending">' . _('Salesman') . '</th>
+ <th class="ascending">' . _('Area') . '</th>
+ <th class="ascending">' . _('Phone No') . '</th>
+ <th class="ascending">' . _('Fax No') . '</th>
+ <th class="ascending">' . _('Email') . '</th>
+ <th class="ascending">' . _('Tax Group') . '</th>
+ <th class="ascending">' . _('Enabled?') . '</th>
+ </tr>
+ </thead>
+ <tbody>';
do {
@@ -453,7 +456,8 @@
} while ($myrow = DB_fetch_row($result));
//END WHILE LIST LOOP
- echo '</table>
+ echo '</tbody>
+ </table>
<br />
<table class="selection">
<tr>
Modified: trunk/CustomerTypes.php
===================================================================
--- trunk/CustomerTypes.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/CustomerTypes.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -184,10 +184,13 @@
$result = DB_query($sql);
echo '<br /><table class="selection">';
- echo '<tr>
- <th class="ascending">' . _('Type ID') . '</th>
- <th class="ascending">' . _('Type Name') . '</th>
- </tr>';
+ echo '<thead>
+ <tr>
+ <th class="ascending">' . _('Type ID') . '</th>
+ <th class="ascending">' . _('Type Name') . '</th>
+ </tr>
+ </thead>
+ <tbody>';
while ($myrow = DB_fetch_row($result)) {
@@ -205,7 +208,7 @@
$myrow[0]);
}
//END WHILE LIST LOOP
- echo '</table>';
+ echo '</tbody></table>';
}
//end of ifs and buts!
Modified: trunk/Dashboard.php
===================================================================
--- trunk/Dashboard.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/Dashboard.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -419,14 +419,16 @@
include('includes/GLPostings.inc');
echo '<br />
<h2>', _('Bank and Credit Card Balances'), '</h2>
- <table class="selection">',
-/* '<thead>',*/ // Need to update the sorting javascript.
- '<tr>
+ <table class="selection">
+ <thead>
+ <tr>
<th class="ascending">', _('GL Account'), '</th>
<th class="ascending">', _('Account Name'), '</th>
<th class="ascending">', _('Balance'), '</th>
- </tr>'
-/*, '</thead><tbody>'*/;// Need to update the sorting javascript.
+ </tr>
+ </thead>
+ <tbody>';
+
$FirstPeriodSelected = GetPeriod(date($_SESSION['DefaultDateFormat']), $db);
$LastPeriodSelected = GetPeriod(date($_SESSION['DefaultDateFormat']), $db);
$SelectedPeriod=$LastPeriodSelected;
@@ -529,8 +531,8 @@
<td class="number">', $DisplayBalance, '</td>
</tr>';
} //each bank account
- echo /*'</tbody>',*/// Need to update the sorting javascript.
- '</table>';
+ echo '</tbody>
+ </table>';
} //CashSecurity
if(in_array($OrderSecurity, $_SESSION['AllowedPageSecurityTokens']) OR !isset($OrderSecurity)) {
Modified: trunk/FixedAssetLocations.php
===================================================================
--- trunk/FixedAssetLocations.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/FixedAssetLocations.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -94,11 +94,14 @@
if (DB_num_rows($result) > 0) {
echo '<table class="selection">
- <tr>
- <th class="ascending">' . _('Location ID') . '</th>
- <th class="ascending">' . _('Location Description') . '</th>
- <th class="ascending">' . _('Parent Location') . '</th>
- </tr>';
+ <thead>
+ <tr>
+ <th class="ascending">' . _('Location ID') . '</th>
+ <th class="ascending">' . _('Location Description') . '</th>
+ <th class="ascending">' . _('Parent Location') . '</th>
+ </tr>
+ </thead>
+ <tbody>';
while ($myrow=DB_fetch_array($result)) {
echo '<tr>
@@ -111,7 +114,7 @@
<td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '?SelectedLocation=', urlencode($myrow['locationid']), '">', _('Edit'), '</a></td></tr>';
}
- echo '</table>';
+ echo '</tbody></table>';
}
echo '<br /><form id="LocationForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">
Modified: trunk/GLAccounts.php
===================================================================
--- trunk/GLAccounts.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/GLAccounts.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -297,6 +297,7 @@
echo '<br />
<table class="selection">
+ <thead>
<tr>
<th class="ascending">', _('Account Code'), '</th>
<th class="ascending">', _('Account Name'), '</th>
@@ -304,7 +305,9 @@
<th class="ascending">', _('P/L or B/S'), '</th>
<th class="ascending">', _('Cash Flows Activity'), '</th>
<th class="noprint" colspan="2"> </th>
- </tr>';
+ </tr>
+ </thead>
+ <tbody>';
$Sql = "SELECT
accountcode,
@@ -330,7 +333,7 @@
</tr>';
}// END foreach($Result as $MyRow).
- echo '</table>';
+ echo '</tbody></table>';
} //END IF selected ACCOUNT
//end of ifs and buts!
Modified: trunk/ImportBankTransAnalysis.php
===================================================================
--- trunk/ImportBankTransAnalysis.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/ImportBankTransAnalysis.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -199,6 +199,7 @@
}
} else { /*Allow GL Analysis == true */
echo '</p><table cellpadding="2" class="selection">
+ <thead>
<tr>
<th colspan="5">' . _('General ledger Analysis') . '</th>
</tr>
@@ -208,9 +209,11 @@
<th class="ascending">' . _('Amount') . '<br />' . _('in') . ' ' . $_SESSION['Statement']->CurrCode . '</th>
<th>' . _('Narrative') . '</th>
<th class="ascending">' . _('Tag') . '</th>
- </tr>';
+ </tr>
+ </thead>
+ <tbody>';
+
$TotalGLValue=0;
- $i=0;
foreach ( $_SESSION['Trans'][$TransID]->GLEntries AS $EnteredGLCode){
@@ -227,7 +230,9 @@
$TotalGLValue += $EnteredGLCode->Amount;
}
- echo '<tr>
+ echo '</tbody>
+ <tfoot>
+ <tr>
<td colspan="2" class="number">' . _('Total of GL Entries') . ':</td>
<td class="number">' . locale_number_format($TotalGLValue,$_SESSION['Statement']->CurrDecimalPlaces) . '</td>
</tr>
@@ -244,6 +249,7 @@
echo '<th colspan="5"><font size="4" color="green">' . _('Reconciled') . '</th>';
}
echo '</tr>
+ </tfoot>
</table>';
@@ -316,4 +322,4 @@
}
echo '</form>';
include('includes/footer.php');
-?>
+?>
\ No newline at end of file
Modified: trunk/InternalStockRequest.php
===================================================================
--- trunk/InternalStockRequest.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/InternalStockRequest.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -238,7 +238,7 @@
</tr>
<tr>
<td>', _('Date when required'), ':</td>
- <td><input type="text" class="date" alt="', $_SESSION['DefaultDateFormat'], '" name="DispatchDate" maxlength="10" size="11" value="', $_SESSION['Request']->DispatchDate, '" /></td>
+ <td><input type="text" class="date" name="DispatchDate" maxlength="10" size="11" value="', $_SESSION['Request']->DispatchDate, '" /></td>
</tr>
<tr>
<td>', _('Narrative'), ':</td>
@@ -262,16 +262,19 @@
<input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />
<br />
<table class="selection">
- <tr>
- <th colspan="7"><h4>', _('Details of Items Requested'), '</h4></th>
- </tr>
- <tr>
- <th>', _('Line Number'), '</th>
- <th class="ascending">', _('Item Code'), '</th>
- <th class="ascending">', _('Item Description'), '</th>
- <th class="ascending">', _('Quantity Required'), '</th>
- <th>', _('UOM'), '</th>
- </tr>';
+ <thead>
+ <tr>
+ <th colspan="7"><h4>', _('Details of Items Requested'), '</h4></th>
+ </tr>
+ <tr>
+ <th>', _('Line Number'), '</th>
+ <th class="ascending">', _('Item Code'), '</th>
+ <th class="ascending">', _('Item Description'), '</th>
+ <th class="ascending">', _('Quantity Required'), '</th>
+ <th>', _('UOM'), '</th>
+ </tr>
+ </thead>
+ <tbody>';
if (isset($_SESSION['Request']->LineItems)) {
foreach ($_SESSION['Request']->LineItems as $LineItems) {
@@ -287,7 +290,8 @@
}
}
-echo '</table>
+echo '</tbody>
+ </table>
<br />
<div class="centre">
<input type="submit" name="Submit" value="', _('Submit'), '" />
@@ -535,8 +539,6 @@
<input type="hidden" name="NextList" value="', ($Offset + 1), '" />
<input tabindex="', ($j+10), '" type="submit" name="Next" value="', _('Next'), '" /></td>
</tr>
- </thead>
- <tbody>
<tr>
<th class="ascending">', _('Code'), '</th>
<th class="ascending">', _('Description'), '</th>
@@ -546,7 +548,10 @@
<th class="ascending">', _('On Order'), '</th>
<th class="ascending">', _('Available'), '</th>
<th class="ascending">', _('Quantity'), '</th>
- </tr>';
+ </tr>
+ </thead>
+ <tbody>';
+
$ImageSource = _('No Image');
$i=0;
Modified: trunk/InternalStockRequestInquiry.php
===================================================================
--- trunk/InternalStockRequestInquiry.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/InternalStockRequestInquiry.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -161,9 +161,9 @@
$_POST['FromDate'] = '';
}
echo '<td>' . _('Date From') . '</td>
- <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="FromDate" maxlength="10" size="11" vaue="' . $_POST['FromDate'] .'" /></td>
+ <td><input type="text" class="date" name="FromDate" maxlength="10" size="11" vaue="' . $_POST['FromDate'] .'" /></td>
<td>' . _('Date To') . '</td>
- <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="ToDate" maxlength="10" size="11" value="' . $_POST['ToDate'] . '" /></td>
+ <td><input type="text" class="date" name="ToDate" maxlength="10" size="11" value="' . $_POST['ToDate'] . '" /></td>
<td><input type="submit" name="Search" value="' ._('Search') . '" /></td></tr></table>';
if (!isset($_POST['ShowDetails'])) {
$_POST['ShowDetails'] = 1;
@@ -258,14 +258,17 @@
if (isset($StockItemsResult)
AND DB_num_rows($StockItemsResult)>1) {
- echo '<a href="' . $RootPath . '/InternalStockRequestInquiry.php">' . _('Return') . '</a>';
- echo '<table cellpadding="2" class="selection">';
- echo '<tr>
- <th class="ascending" >' . _('Code') . '</th>
- <th class="ascending" >' . _('Description') . '</th>
- <th class="ascending" >' . _('Total Applied') . '</th>
- <th>' . _('Units') . '</th>
- </tr>';
+ echo '<a href="' . $RootPath . '/InternalStockRequestInquiry.php">' . _('Return') . '</a>
+ <table cellpadding="2" class="selection">
+ <thead>
+ <tr>
+ <th class="ascending" >' . _('Code') . '</th>
+ <th class="ascending" >' . _('Description') . '</th>
+ <th class="ascending" >' . _('Total Applied') . '</th>
+ <th>' . _('Units') . '</th>
+ </tr>
+ </thead>
+ <tbody>';
while ($myrow=DB_fetch_array($StockItemsResult)) {
@@ -283,7 +286,8 @@
}
//end of while loop
- echo '</table>';
+ echo '</tbody>
+ </table>';
}
Modified: trunk/Locations.php
===================================================================
--- trunk/Locations.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/Locations.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -406,14 +406,17 @@
}
echo '<table class="selection">
- <tr>
- <th class="ascending">', _('Location Code'), '</th>
- <th class="ascending">', _('Location Name'), '</th>
- <th class="ascending">', _('Tax Province'), '</th>
- <th class="ascending">', _('GL Account Code'), '</th>
- <th class="ascending">', _('Allow Invoicing'), '</th>
- <th class="noprint" colspan="2"> </th>
- </tr>';
+ <thead>
+ <tr>
+ <th class="ascending">', _('Location Code'), '</th>
+ <th class="ascending">', _('Location Name'), '</th>
+ <th class="ascending">', _('Tax Province'), '</th>
+ <th class="ascending">', _('GL Account Code'), '</th>
+ <th class="ascending">', _('Allow Invoicing'), '</th>
+ <th class="noprint" colspan="2"> </th>
+ </tr>
+ </thead>
+ <tbody>';
while ($myrow = DB_fetch_array($result)) {
/* warehouse management not implemented ... yet
@@ -441,7 +444,7 @@
htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?', $myrow['loccode']);
}
//END WHILE LIST LOOP
- echo '</table>';
+ echo '</tbody></table>';
}
//end of ifs and buts!
Modified: trunk/PO_AuthoriseMyOrders.php
===================================================================
--- trunk/PO_AuthoriseMyOrders.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/PO_AuthoriseMyOrders.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -54,14 +54,17 @@
<table class="selection">';
/* Create the table for the purchase order header */
-echo '<tr>
- <th class="ascending">' . _('Order Number') . '</th>
- <th class="ascending">' . _('Supplier') . '</th>
- <th class="ascending">' . _('Date Ordered') . '</th>
- <th class="ascending">' . _('Initiator') . '</th>
- <th class="ascending">' . _('Delivery Date') . '</th>
- <th class="ascending">' . _('Status') . '</th>
- </tr>';
+echo '<thead>
+ <tr>
+ <th class="ascending">' . _('Order Number') . '</th>
+ <th class="ascending">' . _('Supplier') . '</th>
+ <th class="ascending">' . _('Date Ordered') . '</th>
+ <th class="ascending">' . _('Initiator') . '</th>
+ <th class="ascending">' . _('Delivery Date') . '</th>
+ <th class="ascending">' . _('Status') . '</th>
+ </tr>
+ </thead>
+ <tbody>';
while ($myrow=DB_fetch_array($result)) {
@@ -109,13 +112,16 @@
<td></td>
<td colspan="5" align="left">
<table class="selection" align="left">
- <tr>
- <th class="ascending">' . _('Product') . '</th>
- <th class="ascending">' . _('Quantity Ordered') . '</th>
- <th class="ascending">' . _('Currency') . '</th>
- <th class="ascending">' . _('Price') . '</th>
- <th class="ascending">' . _('Line Total') . '</th>
- </tr>';
+ <thead>
+ <tr>
+ <th class="ascending">' . _('Product') . '</th>
+ <th class="ascending">' . _('Quantity Ordered') . '</th>
+ <th class="ascending">' . _('Currency') . '</th>
+ <th class="ascending">' . _('Price') . '</th>
+ <th class="ascending">' . _('Line Total') . '</th>
+ </tr>
+ </thead>
+ <tbody>';
while ($LineRow=DB_fetch_array($LineResult)) {
if ($LineRow['decimalplaces']!=NULL){
@@ -131,13 +137,14 @@
<td class="number">' . locale_number_format($LineRow['unitprice']*$LineRow['quantityord'],$myrow['currdecimalplaces']) . '</td>
</tr>';
} // end while order line detail
- echo '</table>
+ echo '</tbody></table>
</td>
</tr>';
}
} //end while header loop
-echo '</table>';
-echo '<br />
+echo '</tbody>
+ </table>
+ <br />
<div class="centre">
<input type="submit" name="UpdateAll" value="' . _('Update'). '" />
</div>
@@ -144,4 +151,4 @@
</div>
</form>';
include('includes/footer.php');
-?>
+?>
\ No newline at end of file
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/PO_Header.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -555,17 +555,17 @@
<input type="submit" value="' . _('Reset') . '" /></div>';
if (isset($result_SuppSelect)) {
- echo '<br /><table cellpadding="3" class="selection">';
+ echo '<br /><table cellpadding="3" class="selection">
+ <thead>
+ <tr>
+ <th class="ascending">' . _('Code') . '</th>
+ <th class="ascending">' . _('Supplier Name') . '</th>
+ <th class="ascending">' . _('Address') . '</th>
+ <th class="ascending">' . _('Currency') . '</th>
+ </tr>
+ </thead>
+ <tbody>';
- echo '<tr>
- <th class="ascending">' . _('Code') . '</th>
- <th class="ascending">' . _('Supplier Name') . '</th>
- <th class="ascending">' . _('Address') . '</th>
- <th class="ascending">' . _('Currency') . '</th>
- </tr>';
-
- $j = 1;
-
while ($myrow = DB_fetch_array($result_SuppSelect)) {
echo '<tr class="striped_row">
@@ -584,7 +584,7 @@
//end of page full new headings if
} //end of while loop
- echo '</table>';
+ echo '</tbody></table>';
}
//end if results to show
@@ -757,7 +757,7 @@
</tr>
<tr>
<td>' . _('Delivery Date') . ':</td>
- <td><input type="text" required="required" autofocus="autofocus" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="DeliveryDate" size="11" value="' . $_POST['DeliveryDate'] . '" /></td>
+ <td><input type="text" required="required" autofocus="autofocus" class="date" name="DeliveryDate" size="11" value="' . $_POST['DeliveryDate'] . '" /></td>
</tr>';
if (!isset($_POST['Initiator'])) {
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/PO_Items.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -710,20 +710,23 @@
echo ' ' . _('Purchase Order') .' '. $_SESSION['PO'.$identifier]->OrderNo ;
}
echo '<br /><b>' . _(' Order Summary') . '</b></p>';
- echo '<table cellpadding="2" class="selection">';
- echo '<tr>
- <th class="ascending">' . _('Item Code') . '</th>
- <th class="ascending">' . _('Description') . '</th>
- <th class="ascending">' . _('Quantity Our Units') . '</th>
- <th>' . _('Our Unit') . '</th>
- <th class="ascending">' . _('Price Our Units') .' (' . $_SESSION['PO'.$identifier]->CurrCode . ')</th>
- <th>' . _('Unit Conversion Factor') . '</th>
- <th class="ascending">' . _('Order Quantity') . '<br />' . _('Supplier Units') . '</th>
- <th>' . _('Supplier Unit') . '</th>
- <th class="ascending">' . _('Order Price') . '<br />' . _('Supp Units') . ' ('.$_SESSION['PO'.$identifier]->CurrCode. ')</th>
- <th class="ascending">' . _('Sub-Total') .' ('.$_SESSION['PO'.$identifier]->CurrCode. ')</th>
- <th class="ascending">' . _('Deliver By') . '</th>
- </tr>';
+ echo '<table cellpadding="2" class="selection">
+ <thead>
+ <tr>
+ <th class="ascending">' . _('Item Code') . '</th>
+ <th class="ascending">' . _('Description') . '</th>
+ <th class="ascending">' . _('Quantity Our Units') . '</th>
+ <th>' . _('Our Unit') . '</th>
+ <th class="ascending">' . _('Price Our Units') .' (' . $_SESSION['PO'.$identifier]->CurrCode . ')</th>
+ <th>' . _('Unit Conversion Factor') . '</th>
+ <th class="ascending">' . _('Order Quantity') . '<br />' . _('Supplier Units') . '</th>
+ <th>' . _('Supplier Unit') . '</th>
+ <th class="ascending">' . _('Order Price') . '<br />' . _('Supp Units') . ' ('.$_SESSION['PO'.$identifier]->CurrCode. ')</th>
+ <th class="ascending">' . _('Sub-Total') .' ('.$_SESSION['PO'.$identifier]->CurrCode. ')</th>
+ <th class="ascending">' . _('Deliver By') . '</th>
+ </tr>
+ </thead>
+ <tbody>';
$_SESSION['PO'.$identifier]->Total = 0;
@@ -753,7 +756,7 @@
<td>' . $POLine->SuppliersUnit . '</td>
<td><input type="text" class="number" name="SuppPrice' . $POLine->LineNo . '" size="10" value="' . $SuppPrice .'" /></td>
<td class="number">' . $DisplayLineTotal . '</td>
- <td><input type="text" class="date" alt="' .$_SESSION['DefaultDateFormat'].'" name="ReqDelDate' . $POLine->LineNo.'" size="10" value="' .$POLine->ReqDelDate .'" /></td>';
+ <td><input type="text" class="date" name="ReqDelDate' . $POLine->LineNo.'" size="10" value="' .$POLine->ReqDelDate .'" /></td>';
if ($POLine->QtyReceived !=0 AND $POLine->Completed!=1){
echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier .'&Complete=' . $POLine->LineNo . '">' . _('Complete') . '</a></td>';
} elseif ($POLine->QtyReceived ==0) {
@@ -765,16 +768,20 @@
}
$DisplayTotal = locale_number_format($_SESSION['PO'.$identifier]->Total,$_SESSION['PO'.$identifier]->CurrDecimalPlaces);
- echo '<tr><td colspan="9" class="number">' . _('TOTAL') . _(' excluding Tax') . '</td>
- <td class="number"><b>' . $DisplayTotal . '</b></td>
- </tr></table>';
- echo '<br />
- <div class="centre">
- <input type="submit" name="UpdateLines" value="' . _('Update Order Lines') . '" />';
+ echo '</tbody>
+ <tfoot>
+ <tr>
+ <td colspan="9" class="number">' . _('TOTAL') . _(' excluding Tax') . '</td>
+ <td class="number"><b>' . $DisplayTotal . '</b></td>
+ </tr>
+ </tfoot>
+ </table>
+ <br />
+ <div class="centre">
+ <input type="submit" name="UpdateLines" value="' . _('Update Order Lines') . '" />
+ <input type="submit" name="Commit" value="' . _('Process Order') . '" />
+ </div>';
- echo ' <input type="submit" name="Commit" value="' . _('Process Order') . '" />
- </div>';
-
} /*Only display the order line items if there are any !! */
@@ -829,7 +836,7 @@
</tr>
<tr>
<td>' . _('Delivery Date') . '</td>
- <td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="ReqDelDate" size="11" value="'.$_SESSION['PO'.$identifier]->DeliveryDate .'" /></td>
+ <td><input type="text" class="date" name="ReqDelDate" size="11" value="'.$_SESSION['PO'.$identifier]->DeliveryDate .'" /></td>
</tr>
</table>
<div class="centre">
Modified: trunk/PO_SelectOSPurchOrder.php
===================================================================
--- trunk/PO_SelectOSPurchOrder.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/PO_SelectOSPurchOrder.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -251,9 +251,9 @@
$Checked = (isset($_POST['PODetails']))?'checked="checked"':'';
echo '</select>
' . _('Orders Between') . ':
- <input type="text" name="DateFrom" value="' . ConvertSQLDate($DateFrom) . '" class="date" size="10" alt="' . $_SESSION['DefaultDateFormat'] . '" />
+ <input type="text" name="DateFrom" value="' . ConvertSQLDate($DateFrom) . '" class="date" size="10" />
' . _('and') . ':
- <input type="text" name="DateTo" value="' . ConvertSQLDate($DateTo) . '" class="date" size="10" alt="' . $_SESSION['DefaultDateFormat'] . '" />
+ <input type="text" name="DateTo" value="' . ConvertSQLDate($DateTo) . '" class="date" size="10" />
<input type="submit" name="SearchOrders" value="' . _('Search Purchase Orders') . '" />
</td>
</tr>
@@ -302,6 +302,7 @@
if (isset($StockItemsResult)) {
echo '<table cellpadding="2" class="selection">
+ <thead>
<tr>
<th class="ascending">' . _('Code') . '</th>
<th class="ascending">' . _('Description') . '</th>
@@ -308,7 +309,9 @@
<th class="ascending">' . _('On Hand') . '</th>
<th class="ascending">' . _('Orders') . '<br />' . _('Outstanding') . '</th>
<th class="ascending">' . _('Units') . '</th>
- </tr>';
+ </tr>
+ </thead>
+ <tbody>';
$StocksStr = '(';
$q = 0;
@@ -345,7 +348,7 @@
$myrow['units']);
} //end of while loop through search items
- echo '</table>';
+ echo '</tbody></table>';
} //end if stock search results to show
else {
@@ -589,7 +592,8 @@
if (DB_num_rows($PurchOrdersResult) > 0) {
/*show a table of the orders returned by the SQL */
- echo '<table cellpadding="2" width="97%" class="selection">';
+ echo '<table cellpadding="2" width="97%" class="selection">
+ <thead>';
if (isset($_POST['PODetails'])) {
$BalHead = '<th class="ascending">' . _('Balance') .' (' . _('Stock ID') . '--' . _('Quantity') . ' )</th>';
@@ -611,8 +615,9 @@
echo '<th class="ascending">' . _('Status') . '</th>
<th>' . _('Print') . '</th>
<th>' . _('Receive') . '</th>
- </tr>';
- $j = 1;
+ </tr>
+ </thead>
+ <tbody>';
while ($myrow = DB_fetch_array($PurchOrdersResult)) {
$Bal = '';
@@ -676,7 +681,7 @@
</tr>';
} //end of while loop around purchase orders retrieved
- echo '</table>';
+ echo '</tbody></table>';
}
}
echo '</div>
Modified: trunk/PaymentMethods.php
===================================================================
--- trunk/PaymentMethods.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/PaymentMethods.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -202,15 +202,18 @@
$result = DB_query($sql,$ErrMsg);
echo '<table class="selection">
- <tr>
- <th class="ascending">' . _('Payment Method') . '</th>
- <th class="ascending">' . _('Use For Payments') . '</th>
- <th class="ascending">' . _('Use For Receipts') . '</th>
- <th class="ascending">' . _('Use Pre-printed Stationery') . '</th>
- <th class="ascending">' . _('Open POS Cash Drawer for Sale') . '</th>
- <th class="ascending">' . _('Payment discount') . ' %</th>
- <th colspan="2"> </th>
- </tr>';
+ <thead>
+ <tr>
+ <th class="ascending">' . _('Payment Method') . '</th>
+ <th class="ascending">' . _('Use For Payments') . '</th>
+ <th class="ascending">' . _('Use For Receipts') . '</th>
+ <th class="ascending">' . _('Use Pre-printed Stationery') . '</th>
+ <th class="ascending">' . _('Open POS Cash Drawer for Sale') . '</th>
+ <th class="ascending">' . _('Payment discount') . ' %</th>
+ <th colspan="2"> </th>
+ </tr>
+ </thead>
+ <tbody>';
while ($myrow = DB_fetch_array($result)) {
@@ -226,7 +229,7 @@
</tr>';
} //END WHILE LIST LOOP
- echo '</table><br />';
+ echo '</tbody></table><br />';
} //end of ifs and buts!
Modified: trunk/Prices.php
===================================================================
--- trunk/Prices.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/Prices.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -206,18 +206,18 @@
$result = DB_query($sql);
require_once('includes/CurrenciesArray.php');
if (DB_num_rows($result) > 0) {
- echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
- echo '<div>';
- echo '<table class="selection">
+ echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <table class="selection">
+ <thead>
<tr>
- <th colspan="7">
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />' .
+ <th colspan="7">' .
_('Pricing for part') . ':
<input type="text" required="required" autofocus="autofocus" name="Item" size="22" value="' . $Item . '" maxlength="20" />
<input type="submit" name="NewPart" value="' . _('Review Prices') . '" /></th>
- </tr>';
-
- echo '<tbody><tr><th class="ascending">' . _('Currency') . '</th>
+ </tr>
+ <tr><th class="ascending">' . _('Currency') . '</th>
<th class="ascending">' . _('Sales Type') . '</th>
<th class="ascending">' . _('Price') . '</th>
<th class="ascending">' . _('Start Date') . ' </th>
@@ -225,7 +225,9 @@
if (in_array(5, $_SESSION['AllowedPageSecurityTokens'])) { // If is allow to modify prices.
echo '<th colspan="2">' . _('Maintenance') . '</th>';
}
- echo '</tr>';
+ echo '</tr>
+ </thead>
+ <tbody>';
while ($myrow = DB_fetch_array($result)) {
if ($myrow['enddate']=='9999-12-31'){
@@ -250,8 +252,9 @@
}
//END WHILE LIST LOOP
- echo '</tbody></table><br />';
- echo '</div>
+ echo '</tbody>
+ </table><br />
+ </div>
</form>';
} else {
prnMsg(_('There are no prices set up for this part'),'warn');
@@ -320,9 +323,9 @@
$_POST['EndDate'] = '';
}
echo '<tr><td>' . _('Price Effective From Date') . ':</td>
- <td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="StartDate" required="required" size="10" maxlength="10" title="' . _('Enter the date from which this price should take effect.') . '" value="' . $_POST['StartDate'] . '" /></td></tr>';
+ <td><input type="text" class="date" name="StartDate" required="required" size="10" maxlength="10" title="' . _('Enter the date from which this price should take effect.') . '" value="' . $_POST['StartDate'] . '" /></td></tr>';
echo '<tr><td>' . _('Price Effective To Date') . ':</td>
- <td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="EndDate" size="10" maxlength="10" title="' . _('Enter the date to which this price should be in effect to, or leave empty if the price should continue indefinitely') . '" value="' . $_POST['EndDate'] . '" />';
+ <td><input type="text" class="date" name="EndDate" size="10" maxlength="10" title="' . _('Enter the date to which this price should be in effect to, or leave empty if the price should continue indefinitely') . '" value="' . $_POST['EndDate'] . '" />';
echo '<input type="hidden" name="Item" value="' . $Item.'" /></td></tr>';
echo '<tr><td>' . _('Price') . ':</td>
<td>
Modified: trunk/PricesByCost.php
===================================================================
--- trunk/PricesByCost.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/PricesByCost.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -147,7 +147,17 @@
echo '<div class="page_help_text">' . _('Items in') . ' ' . $CategoryText . ' ' . _('With Prices') . ' ' . $Comparator . '' . $_POST['Margin'] . ' ' . _('times') . ' ' . _('Cost in Price List') . ' ' . $SalesTypeRow['sales_type'] . '</div><br /><br />';
if ($numrow > 0) { //the number of prices returned from the main prices query is
+ echo '<form action="' .htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'" method="post" id="update">';
+ echo '<div>';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo'<input type="hidden" value="' . $_POST['StockCat'] . '" name="StockCat" />
+ <input type="hidden" value="' . $_POST['Margin'] . '" name="Margin" />
+ <input type="hidden" value="' . $_POST['CurrCode'] . '" name="CurrCode" />
+ <input type="hidden" value="' . $_POST['Comparator'] . '" name="Comparator" />
+ <input type="hidden" value="' . $_POST['SalesType'] . '" name="SalesType" />';
+
echo '<table class="selection">
+ <thead>
<tr>
<th class="ascending">' . _('Code') . '</th>
<th class="ascending">' . _('Description') . '</th>
@@ -159,17 +169,10 @@
<th class="ascending">' . _('GP %') . '</th>
<th class="ascending">' . _('Price Proposed') . '</th>
<th class="ascending">' . _('List Price') . '</th>
- <tr>';
+ <tr>
+ </thead>
+ <tbody>';
- echo '<form action="' .htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'" method="post" id="update">';
- echo '<div>';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo'<input type="hidden" value="' . $_POST['StockCat'] . '" name="StockCat" />
- <input type="hidden" value="' . $_POST['Margin'] . '" name="Margin" />
- <input type="hidden" value="' . $_POST['CurrCode'] . '" name="CurrCode" />
- <input type="hidden" value="' . $_POST['Comparator'] . '" name="Comparator" />
- <input type="hidden" value="' . $_POST['SalesType'] . '" name="SalesType" />';
-
$PriceCounter =0;
while ($myrow = DB_fetch_array($result)) {
@@ -213,10 +216,15 @@
</tr> ';
$PriceCounter++;
} //end of looping
- echo '<tr>
- <td class="number" colspan="4"><input type="submit" name="submit" value="' . _('Update') . '" onclick="return confirm(\'' . _('If the prices above do not have a commencement date as today, this will create new prices with commencement date of today at the entered figures and update the existing prices with historical start dates to have an end date of yesterday. Are You Sure?') . '\');" /></td>
- <td class="text" colspan="3"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '"><input type="submit" value="' . _('Back') . '" /></a></td>
- </tr>
+
+ echo '</tbody>
+ <tfoot>
+ <tr>
+ <td class="number" colspan="4"><input type="submit" name="submit" value="' . _('Update') . '" onclick="return confirm(\'' . _('If the prices above do not have a commencement date as today, this will create new prices with commencement date of today at the entered figures and update the existing prices with historical start dates to have an end date of yesterday. Are You Sure?') . '\');" /></td>
+ <td class="text" colspan="3"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '"><input type="submit" value="' . _('Back') . '" /></a></td>
+ </tr>
+ </tfoot>
+ </table>
</div>
</form>';
} else {
Modified: trunk/ProductSpecs.php
===================================================================
--- trunk/ProductSpecs.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/ProductSpecs.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -159,6 +159,7 @@
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">
+ <thead>
<tr>
<th class="ascending">' . _('Add') . '</th>
<th class="ascending">' . _('Name') . '</th>
@@ -168,7 +169,9 @@
<th>' . _('Target Value') . '</th>
<th>' . _('Range Min') . '</th>
<th>' . _('Range Max') . '</th>
- </tr>';
+ </tr>
+ </thead>
+ <tbody>';
$x=0;
while ($myrow=DB_fetch_array($result)) {
@@ -225,12 +228,15 @@
} //END WHILE LIST LOOP
- echo '</table><br /></div>
- <div class="centre">
- <input type="hidden" name="KeyValue" value="' . $KeyValue . '" />
- <input type="hidden" name="AddTestsCounter" value="' . $x . '" />
- <input type="submit" name="AddTests" value="' . _('Add') . '" />
- </div></form>';
+ echo '</tbody>
+ </table><br />
+ <div class="centre">
+ <input type="hidden" name="KeyValue" value="' . $KeyValue . '" />
+ <input type="hidden" name="AddTestsCounter" value="' . $x . '" />
+ <input type="submit" name="AddTests" value="' . _('Add') . '" />
+ </div>
+ </div>
+ </form>';
include('includes/footer.php');
exit;
} //ListTests
@@ -375,20 +381,23 @@
$result = DB_query($sql);
echo '<table class="selection">
- <tr>
- <th class="ascending">' . _('Name') . '</th>
- <th class="ascending">' . _('Method') . '</th>
- <th class="ascending">' . _('Units') . '</th>
- <th class="ascending">' . _('Type') . '</th>
- <th>' . _('Possible Values') . '</th>
- <th>' . _('Target Value') . '</th>
- <th>' . _('Range Min') . '</th>
- <th>' . _('Range Max') . '</th>
- <th class="ascending">' . _('Show on Cert') . '</th>
- <th class="ascending">' . _('Show on Spec') . '</th>
- <th class="ascending">' . _('Show on Test Plan') . '</th>
- <th class="ascending">' . _('Active') . '</th>
- </tr>';
+ <thead>
+ <tr>
+ <th class="ascending">' . _('Name') . '</th>
+ <th class="ascending">' . _('Method') . '</th>
+ <th class="ascending">' . _('Units') . '</th>
+ <th class="ascending">' . _('Type') . '</th>
+ <th>' . _('Possible Values') . '</th>
+ <th>' . _('Target Value') . '</th>
+ <th>' . _('Range Min') . '</th>
+ <th>' . _('Range Max') . '</th>
+ <th class="ascending">' . _('Show on Cert') . '</th>
+ <th class="ascending">' . _('Show on Spec') . '</th>
+ <th class="ascending">' . _('Show on Test Plan') . '</th>
+ <th class="ascending">' . _('Active') . '</th>
+ </tr>
+ </thead>
+ <tbody>';
while ($myrow=DB_fetch_array($result)) {
@@ -473,7 +482,7 @@
$KeyValue);
} //END WHILE LIST LOOP
- echo '</table><br />';
+ echo '</tbody></table><br />';
} //end of ifs and buts!
if (isset($SelectedQATest)) {
Modified: trunk/PurchData.php
===================================================================
--- trunk/PurchData.php 2018-02-23 05:13:47 UTC (rev 7978)
+++ trunk/PurchData.php 2018-02-23 06:08:16 UTC (rev 7979)
@@ -266,22 +266,25 @@
$NoPurchasingData=1;
} else if ($StockID != '') {
- echo '<table cellpadding="2" class="selection">';
- $TableHeader = '<tr>
- <th class="ascending">' . _('Supplier') . '</th>
- <th class="ascending">' . _('Price') . '</th>
- <th>' . _('Supplier Unit') . '</th>
- <th>' . _('Conversion Factor') . '</th>
- <th class="ascending">' . _('Cost Per Our Unit') . '</th>
- <th class="ascending">' . _('Currency') . '</th>
- <th class="ascending">' . _('Effective From') . '</th>
- <th class="ascending">' . _('Min Order Qty') . '</th>
- <th class="ascending">' . _('Lead Time') . '</th>
- <th>' . _('Preferred') . '</th>
- </tr>';
- echo $TableHeader;
- $CountPreferreds = 0;
+ echo '<table cellpadding="2" class="selection">
+ <thead>
+ <tr>
+ <th class="ascending">' . _('Supplier') . '</th>
+ <th class="ascending">' . _('Price') . '</th>
+ <th>' . _('Supplier Unit') . '</th>
+ <th>' . _('Conversion Factor') . '</th>
+ <th class="ascending">' . _('Cost Per Our Unit') . '</th>
+ <th class="ascending">' . _('Currency') . '</th>
+ <th class="ascending">' . _('Effective From') . '</th>
+ <th class="ascending">' . _('Min Order Qty') . '</th>
+ <th class="ascending">' . _('Lead Time') . '</th>
+ <th>' . _('Preferred') . '</th>
+ </tr>
+ </thead>
+ <tbody>';
+ $CountPreferreds = 0;
+
while ($myrow = DB_fetch_array($PurchDataResult)) {
if ($myrow['preferred'] == 1) {
$DisplayPreferred = _('Yes');
@@ -328,7 +331,7 @@
$myrow['supplierno'],
$myrow['effectivefrom']);
} //end of while loop
- echo '</table><br/>';
+ echo '</tbody></table><br/>';
if ($CountPreferreds > 1) {
prnMsg(_('There are now') . ' ' . $CountPreferreds . ' ' . _('preferred suppliers set up for') . ' ' . $StockID . ' ' . _('you should edit the supplier purchasing data to make only one supplier the preferred supplier'), 'warn');
} elseif ($CountPreferreds == 0) {
@@ -456,16 +459,18 @@
}
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post">
<table cellpadding="2" colspan="7" class="selection">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- $TableHeader = '<tr>
- <th class="ascending">' . _('Code') . '</th>
- <th class="ascending">' . _('Supplier Name') . '</th>
- <th class="ascending">' . _('Currency') . '</th>
- <th class="ascending">' . _('Address 1') . '</th>
- <th class="ascending">' . _('Address 2') . '</th>
- <th class="ascending">' . _('Address 3') . '</th>
- </tr>';
- echo $TableHeader;
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <thead>
+ <tr>
+ <th class="ascending">' . _('Code') . '</th>
+ <th class="ascending">' . _('Supplier Name') . '</th>
+ <th class="ascending">' . _('Currency') . '</th>
+ <th class="ascending">' . _('Address 1') . '</th>
+ <th class="ascending">' . _('Address 2') . '</th>
+ <th class="ascending">' . _('Address 3') . '</th>
+ </tr>
+ </thead>
+ <tbody>';
while ($myrow = DB_fetch_array($SuppliersResult)) {
printf('<tr class="striped_row">
@@ -488,7 +493,8 @@
}
//end of while loop
- echo '</table>
+ echo '</tbody>
+ </table>
<br/>
</form>';
}
@@ -604,7 +610,7 @@
</tr>
<tr>
<td>' . _('Price Effective From') . ':</td>
- <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="EffectiveFrom" maxlength="10" size="11" value="' . $_POST['EffectiveFrom'] . '" /></td>
+ <td><input type="text" class="date" name="EffectiveFrom" maxlength="10" size="11" value="' . $_POST['EffectiveFrom'] . '" /></td>
</tr>
<tr>
<td>' . _('Our Unit of Measure') . ':</td>';
@@ -681,13 +687,16 @@
$DiscountsResult = DB_query($sql, $ErrMsg, $DbgMsg);
echo '<table cellpadding="2" colspan="7" class="selection">
+ <thead>
<tr>
<th class="ascending">' . _('Discount ...
[truncated message content] |
