Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[6197] trunk
|
From: <dai...@us...> - 2013-08-13 19:44:07
|
Revision: 6197
http://sourceforge.net/p/web-erp/reponame/6197
Author: daintree
Date: 2013-08-13 19:44:04 +0000 (Tue, 13 Aug 2013)
Log Message:
-----------
html5 and sorting tables
Modified Paths:
--------------
trunk/PO_AuthorisationLevels.php
trunk/PO_Header.php
trunk/SelectCustomer.php
trunk/SelectOrderItems.php
trunk/SelectSalesOrder.php
trunk/SelectSupplier.php
trunk/ShopParameters.php
trunk/css/aguapop/default.css
trunk/css/default/default.css
trunk/css/fluid/default.css
trunk/css/fresh/default.css
trunk/css/gel/default.css
trunk/css/professional/default.css
trunk/css/professional-rtl/default.css
trunk/css/silverwolf/default.css
trunk/css/wood/default.css
trunk/includes/CountriesArray.php
trunk/javascripts/MiscFunctions.js
trunk/sql/mysql/upgrade4.10-4.11.sql
Removed Paths:
-------------
trunk/css/aguapop/images/ascending.png
trunk/css/aguapop/images/descending.png
trunk/css/default/images/ascending.png
trunk/css/default/images/descending.png
trunk/css/fluid/images/ascending.png
trunk/css/fluid/images/descending.png
trunk/css/fresh/images/ascending.png
trunk/css/fresh/images/descending.png
trunk/css/gel/images/ascending.png
trunk/css/gel/images/descending.png
trunk/css/professional/images/ascending.png
trunk/css/professional/images/descending.png
trunk/css/professional-rtl/images/ascending.png
trunk/css/professional-rtl/images/descending.png
trunk/css/silverwolf/images/ascending.png
trunk/css/silverwolf/images/descending.png
trunk/css/wood/images/ascending.png
trunk/css/wood/images/descending.png
Modified: trunk/PO_AuthorisationLevels.php
===================================================================
--- trunk/PO_AuthorisationLevels.php 2013-08-13 03:07:05 UTC (rev 6196)
+++ trunk/PO_AuthorisationLevels.php 2013-08-13 19:44:04 UTC (rev 6197)
@@ -212,7 +212,9 @@
</tr>';
echo '<input type="hidden" name="CurrCode" value="'.$Currency.'" />';
} else {
- echo '<tr><td>'._('Currency').'</td><td><select name="CurrCode">';
+ echo '<tr>
+ <td>'._('Currency').'</td>
+ <td><select name="CurrCode">';
$currencysql="SELECT currabrev,currency FROM currencies";
$currencyresult=DB_query($currencysql,$db);
while ($myrow=DB_fetch_array($currencyresult)) {
@@ -247,7 +249,7 @@
echo '<tr>
<td>'._('User can authorise orders up to :').'</td>';
-echo '<td><input type="text" name="AuthLevel" size="11" class="number" value="' . locale_number_format($AuthLevel,$CurrDecimalPlaces) . '" /></td>
+echo '<td><input type="text" name="AuthLevel" size="11" class="integer" title="' . _('Enter the amount that this user is premitted to authorise purchase orders up to') . '" value="' . locale_number_format($AuthLevel,$CurrDecimalPlaces) . '" /></td>
</tr>
</table>';
@@ -265,4 +267,4 @@
echo '</div>
</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2013-08-13 03:07:05 UTC (rev 6196)
+++ trunk/PO_Header.php 2013-08-13 19:44:04 UTC (rev 6197)
@@ -538,7 +538,7 @@
echo '<table cellpadding="3" class="selection">
<tr>
<td>' . _('Enter text in the supplier name') . ':</td>
- <td><input type="text" name="Keywords" size="20" maxlength="25" /></td>
+ <td><input type="text" name="Keywords" autofocus="autofocus" size="20" maxlength="25" /></td>
<td><h3><b>' . _('OR') . '</b></h3></td>
<td>' . _('Enter text extract in the supplier code') . ':</td>
<td><input type="text" name="SuppCode" size="15" maxlength="18" /></td>
@@ -549,8 +549,6 @@
<input type="submit" name="SearchSuppliers" value="' . _('Search Now') . '" />
<input type="submit" value="' . _('Reset') . '" /></div>';
- echo '<script type="text/javascript">defaultControl(document.forms[0].Keywords);</script>';
-
if (isset($result_SuppSelect)) {
echo '<br /><table cellpadding="3" class="selection">';
@@ -742,7 +740,7 @@
</tr>
<tr>
<td>' . _('Delivery Date') . ':</td>
- <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="DeliveryDate" size="11" value="' . $_POST['DeliveryDate'] . '" /></td>
+ <td><input type="text" required="required" autofocus="autofocus" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="DeliveryDate" size="11" value="' . $_POST['DeliveryDate'] . '" /></td>
</tr>';
if (!isset($_POST['Initiator'])) {
@@ -757,9 +755,11 @@
</tr>
<tr>
<td>' . _('Requisition Ref') . ':</td>
- <td><input type="text" name="Requisition" size="16" maxlength="15" value="' . $_POST['Requisition'] . '" /></td>
+ <td><input type="text" name="Requisition" size="16" maxlength="15" title="' . _('Enter our purchase requisition reference if needed') . '" value="' . $_POST['Requisition'] . '" /></td>
</tr>
- <tr><td>' . _('Date Printed') . ':</td><td>';
+ <tr>
+ <td>' . _('Date Printed') . ':</td>
+ <td>';
if (isset($_SESSION['PO' . $identifier]->DatePurchaseOrderPrinted) AND mb_strlen($_SESSION['PO' . $identifier]->DatePurchaseOrderPrinted) > 6) {
echo ConvertSQLDate($_SESSION['PO' . $identifier]->DatePurchaseOrderPrinted);
@@ -793,7 +793,9 @@
<table class="selection" width="100%">';
if ($_SESSION['ExistingOrder'] != 0 AND $_SESSION['PO' . $identifier]->Status == 'Printed') {
- echo '<tr><td><a href="' . $RootPath . '/GoodsReceived.php?PONumber=' . $_SESSION['PO' . $identifier]->OrderNo . '&identifier=' . $identifier . '">' . _('Receive this order') . '</a></td></tr>';
+ echo '<tr>
+ <td><a href="' . $RootPath . '/GoodsReceived.php?PONumber=' . $_SESSION['PO' . $identifier]->OrderNo . '&identifier=' . $identifier . '">' . _('Receive this order') . '</a></td>
+ </tr>';
}
if ($_SESSION['PO' . $identifier]->Status == '') { //then its a new order
@@ -843,13 +845,15 @@
</tr>
<tr>
<td colspan="2">' . html_entity_decode($_SESSION['PO' . $identifier]->StatusComments, ENT_QUOTES, 'UTF-8') . '</td>
+ </tr>
+ <input type="hidden" name="StatusCommentsComplete" value="' . htmlspecialchars($_SESSION['PO' . $identifier]->StatusComments, ENT_QUOTES, 'UTF-8') . '" />
+ <tr>
+ <td><input type="submit" name="UpdateStatus" value="' . _('Status Update') . '" /></td>
</tr>';
-
- echo '<input type="hidden" name="StatusCommentsComplete" value="' . htmlspecialchars($_SESSION['PO' . $identifier]->StatusComments, ENT_QUOTES, 'UTF-8') . '" />';
- echo '<tr><td><input type="submit" name="UpdateStatus" value="' . _('Status Update') . '" /></td></tr>';
} //end its not a new order
- echo '</table></td></tr>';
+ echo '</table></td>
+ </tr>';
echo '<tr>
<th><h3>' . _('Warehouse Info') . '</h3></th>
@@ -862,7 +866,7 @@
echo '<table class="selection" width="100%">
<tr>
<td>' . _('Warehouse') . ':</td>
- <td><select name="StkLocation" onchange="ReloadForm(form1.LookupDeliveryAddress)">';
+ <td><select required="required" name="StkLocation" onchange="ReloadForm(form1.LookupDeliveryAddress)">';
$sql = "SELECT loccode,
locationname
@@ -967,7 +971,7 @@
echo '<tr>
<td>' . _('Delivery Contact') . ':</td>
- <td><input type="text" name="Contact" size="41" value="' . $_SESSION['PO' . $identifier]->Contact . '" /></td>
+ <td><input type="text" name="Contact" size="41" title="' . _('Enter the name of the contact at the delivery address - normally our warehouse person at that warehouse') . '" value="' . $_SESSION['PO' . $identifier]->Contact . '" /></td>
</tr>
<tr>
<td>' . _('Address') . ' 1 :</td>
@@ -995,10 +999,11 @@
</tr>
<tr>
<td>' . _('Phone') . ':</td>
- <td><input type="text" name="Tel" size="31" maxlength="30" value="' . $_SESSION['PO' . $identifier]->Tel . '" /></td>
+ <td><input type="tel" name="Tel" pattern="[0-9+\-\s]*" size="31" maxlength="30" value="' . $_SESSION['PO' . $identifier]->Tel . '" /></td>
</tr>
<tr>
- <td>' . _('Delivery By') . ':</td><td><select name="DeliveryBy">';
+ <td>' . _('Delivery By') . ':</td>
+ <td><select name="DeliveryBy">';
$ShipperResult = DB_query("SELECT shipper_id, shippername FROM shippers", $db);
@@ -1079,7 +1084,7 @@
</tr>
<tr>
<td>' . _('Phone') . ':</td>
- <td><input type="text" name="SuppTel" size="31" maxlength="30" value="' . $_SESSION['PO' . $identifier]->SuppTel . '" /></td>
+ <td><input type="tel" name="SuppTel" pattern="[0-9+\-\s]*" size="31" maxlength="30" value="' . $_SESSION['PO' . $identifier]->SuppTel . '" /></td>
</tr>';
$result = DB_query("SELECT terms, termsindicator FROM paymentterms", $db);
@@ -1122,7 +1127,8 @@
/*end of sub table */
echo '</td></tr>
- <tr><th colspan="4"><h3>' . _('Comments');
+ <tr>
+ <th colspan="4"><h3>' . _('Comments');
$Default_Comments = '';
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2013-08-13 03:07:05 UTC (rev 6196)
+++ trunk/SelectCustomer.php 2013-08-13 19:44:04 UTC (rev 6197)
@@ -416,18 +416,16 @@
echo '<br />
<table cellpadding="2" class="selection">';
- $TableHeader = '<tr>
- <th>' . _('Code') . '</th>
- <th>' . _('Customer Name') . '</th>
- <th>' . _('Branch') . '</th>
- <th>' . _('Contact') . '</th>
- <th>' . _('Type') . '</th>
- <th>' . _('Phone') . '</th>
- <th>' . _('Fax') . '</th>
- <th>' . _('Email') . '</th>
- </tr>';
- echo $TableHeader;
- $j = 1;
+ echo '<tr>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Code') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Customer Name') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Branch') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Contact') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Type') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Phone') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Fax') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Email') . '</th>
+ </tr>';
$k = 0; //row counter to determine background colour
$RowIndex = 0;
} //end if NOT producing a CSV file
@@ -464,11 +462,6 @@
<td>' . $myrow['email'] . '</td>
</tr>';
$i++;
- $j++; //row counter
- if ($j == 11 AND ($RowIndex + 1 != $_SESSION['DisplayRecordsMax'])) {
- $j = 1;
- echo $TableHeader;
- } //$j == 11 AND ($RowIndex + 1 != $_SESSION['DisplayRecordsMax'])
$RowIndex++;
//end of page full new headings if
} //end loop through customers
@@ -613,10 +606,10 @@
echo '<br /><div class="centre"><img src="' . $RootPath . '/css/' . $Theme . '/images/group_add.png" title="' . _('Customer Contacts') . '" alt="" />' . ' ' . _('Customer Contacts') . '</div>';
echo '<br /><table width="45%">';
echo '<tr>
- <th>' . _('Name') . '</th>
- <th>' . _('Role') . '</th>
- <th>' . _('Phone Number') . '</th>
- <th>' . _('Email') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Name') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Role') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Phone Number') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Email') . '</th>
<th>' . _('Notes') . '</th>
<th>' . _('Edit') . '</th>
<th>' . _('Delete') . '</th>
@@ -663,10 +656,10 @@
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%">';
echo '<tr>
- <th>' . _('Date') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Date') . '</th>
<th>' . _('Note') . '</th>
<th>' . _('Hyperlink') . '</th>
- <th>' . _('Priority') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Priority') . '</th>
<th>' . _('Edit') . '</th>
<th>' . _('Delete') . '</th>
<th> <a href="AddCustomerNotes.php?DebtorNo=' . $_SESSION['CustomerID'] . '">' . ' ' . _('Add New Note') . '</a> </th>
@@ -705,10 +698,10 @@
echo '<br /><div class="centre"><img src="' . $RootPath . '/css/' . $Theme . '/images/folder_add.png" title="' . _('Customer Type (Group) Notes') . '" alt="" />' . ' ' . _('Customer Type (Group) Notes for:' . '<b> ' . $CustomerTypeName . '</b>') . '</div><br />';
echo '<table width="45%">';
echo '<tr>
- <th>' . _('Date') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Date') . '</th>
<th>' . _('Note') . '</th>
<th>' . _('File Link / Reference / URL') . '</th>
- <th>' . _('Priority') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Priority') . '</th>
<th>' . _('Edit') . '</th>
<th>' . _('Delete') . '</th>
<th><a href="AddCustomerTypeNotes.php?DebtorType=' . $CustomerType . '">' . _('Add New Group Note') . '</a></th>
@@ -741,4 +734,4 @@
} //end if isset($_SESSION['CustomerID']) AND $_SESSION['CustomerID'] != ''
echo '<script type="text/javascript">defaultControl(document.forms[0].CustCode);</script>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2013-08-13 03:07:05 UTC (rev 6196)
+++ trunk/SelectOrderItems.php 2013-08-13 19:44:04 UTC (rev 6197)
@@ -639,14 +639,13 @@
<br />
<table class="selection">';
- $TableHeader = '<tr>
- <th>' . _('Customer') . '</th>
- <th>' . _('Branch') . '</th>
- <th>' . _('Contact') . '</th>
- <th>' . _('Phone') . '</th>
- <th>' . _('Fax') . '</th>
- </tr>';
- echo $TableHeader;
+ echo '<tr>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('Customer') . '</th>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('Branch') . '</th>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('Contact') . '</th>
+ <th>' . _('Phone') . '</th>
+ <th>' . _('Fax') . '</th>
+ </tr>';
$j = 1;
$k = 0; //row counter to determine background colour
@@ -660,18 +659,15 @@
echo '<tr class="OddTableRows">';
$k=1;
}
- if ($LastCustomer != $myrow['name']) {
- echo '<td>'.htmlspecialchars($myrow['name'], ENT_QUOTES, 'UTF-8', false).'</td>';
- } else {
- echo '<td></td>';
- }
- echo '<td><input tabindex="'.strval($j+5).'" type="submit" name="SubmitCustomerSelection' . $j .'" value="' . htmlspecialchars($myrow['brname'], ENT_QUOTES, 'UTF-8', false). '" />
+
+ echo ' <td>' . htmlspecialchars($myrow['name'], ENT_QUOTES, 'UTF-8', false).'</td>
+ <td><input tabindex="'.strval($j+5).'" type="submit" name="SubmitCustomerSelection' . $j .'" value="' . htmlspecialchars($myrow['brname'], ENT_QUOTES, 'UTF-8', false). '" />
<input type="hidden" name="SelectedCustomer' . $j .'" value="'.$myrow['debtorno'].'" />
<input type="hidden" name="SelectedBranch' . $j .'" value="'. $myrow['branchcode'].'" /></td>
<td>' . $myrow['contactname'] . '</td>
<td>' . $myrow['phoneno'] . '</td>
<td>' . $myrow['faxno'] . '</td>
- </tr>';
+ </tr>';
$LastCustomer=$myrow['name'];
$j++;
//end of page full new headings if
@@ -1373,8 +1369,8 @@
if($_SESSION['Items'.$identifier]->DefaultPOLine == 1){
echo '<th>' . _('PO Line') . '</th>';
}
- echo '<th>' . _('Item Code') . '</th>
- <th>' . _('Item Description') . '</th>
+ echo '<th class="ascending" onclick="SortSelect(this)" >' . _('Item Code') . '</th>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('Item Description') . '</th>
<th>' . _('Quantity') . '</th>
<th>' . _('QOH') . '</th>
<th>' . _('Unit') . '</th>
@@ -1536,17 +1532,16 @@
<br />
<table class="table1">';
- $TableHeader = '<tr>
- <th>' . _('Code') . '</th>
- <th>' . _('Description') . '</th>
- <th>' . _('Units') . '</th>
- <th>' . _('On Hand') . '</th>
- <th>' . _('On Demand') . '</th>
- <th>' . _('On Order') . '</th>
- <th>' . _('Available') . '</th>
- <th>' . _('Quantity') . '</th>
- </tr>';
- echo $TableHeader;
+ echo '<tr>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('Code') . '</th>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('Description') . '</th>
+ <th>' . _('Units') . '</th>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('On Hand') . '</th>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('On Demand') . '</th>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('On Order') . '</th>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('Available') . '</th>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('Quantity') . '</th>
+ </tr>';
$i=0;
$j=1;
$k=0; //row colour counter
@@ -1737,17 +1732,16 @@
echo '<tr><td colspan="1"><input type="hidden" name="PreviousList" value="'.strval($Offset-1).'" /><input tabindex="'.strval($j+8).'" type="submit" name="Previous" value="'._('Previous').'" /></td>';
echo '<td style="text-align:center" colspan="6"><input type="hidden" name="SelectingOrderItems" value="1" /><input tabindex="'.strval($j+9).'" type="submit" value="'._('Add to Sales Order').'" /></td>';
echo '<td colspan="1"><input type="hidden" name="NextList" value="'.strval($Offset+1).'" /><input tabindex="'.strval($j+10).'" type="submit" name="Next" value="'._('Next').'" /></td></tr>';
- $TableHeader = '<tr>
- <th>' . _('Code') . '</th>
- <th>' . _('Description') . '</th>
- <th>' . _('Units') . '</th>
- <th>' . _('On Hand') . '</th>
- <th>' . _('On Demand') . '</th>
- <th>' . _('On Order') . '</th>
- <th>' . _('Available') . '</th>
- <th>' . _('Quantity') . '</th>
- </tr>';
- echo $TableHeader;
+ echo '<tr>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('Code') . '</th>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('Description') . '</th>
+ <th>' . _('Units') . '</th>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('On Hand') . '</th>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('On Demand') . '</th>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('On Order') . '</th>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('Available') . '</th>
+ <th>' . _('Quantity') . '</th>
+ </tr>';
$ImageSource = _('No Image');
$i=0;
$k=0; //row colour counter
@@ -1860,11 +1854,13 @@
#end of page full new headings if
}
#end of while loop
- echo '<tr><td><input type="hidden" name="PreviousList" value="'. strval($Offset-1).'" /><input tabindex="'. strval($j+7).'" type="submit" name="Previous" value="'._('Previous').'" /></td>';
- echo '<td style="text-align:center" colspan="6"><input type="hidden" name="SelectingOrderItems" value="1" /><input tabindex="'. strval($j+8).'" type="submit" value="'._('Add to Sales Order').'" /></td>';
- echo '<td><input type="hidden" name="NextList" value="'.strval($Offset+1).'" /><input tabindex="'.strval($j+9).'" type="submit" name="Next" value="'._('Next').'" /></td></tr>';
- echo '</table>
- </div>';
+ echo '<tr>
+ <td><input type="hidden" name="PreviousList" value="'. strval($Offset-1).'" /><input tabindex="'. strval($j+7).'" type="submit" name="Previous" value="'._('Previous').'" /></td>
+ <td style="text-align:center" colspan="6"><input type="hidden" name="SelectingOrderItems" value="1" /><input tabindex="'. strval($j+8).'" type="submit" value="'._('Add to Sales Order').'" /></td>
+ <td><input type="hidden" name="NextList" value="'.strval($Offset+1).'" /><input tabindex="'.strval($j+9).'" type="submit" name="Next" value="'._('Next').'" /></td>
+ </tr>
+ </table>
+ </div>';
echo $jsCall;
}#end if SearchResults to show
@@ -1937,4 +1933,4 @@
}#end of else not selecting a customer
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2013-08-13 03:07:05 UTC (rev 6196)
+++ trunk/SelectSalesOrder.php 2013-08-13 19:44:04 UTC (rev 6197)
@@ -606,15 +606,13 @@
AND DB_num_rows($StockItemsResult)>0) {
echo '<table cellpadding="2" class="selection">';
- $TableHeader = '<tr>
- <th>' . _('Code') . '</th>
- <th>' . _('Description') . '</th>
- <th>' . _('On Hand') . '</th>
- <th>' . _('Units') . '</th>
- </tr>';
- echo $TableHeader;
-
- $j = 1;
+ echo '<tr>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('Code') . '</th>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('Description') . '</th>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('On Hand') . '</th>
+ <th>' . _('Units') . '</th>
+ </tr>';
+
$k=0; //row colour counter
while ($myrow=DB_fetch_array($StockItemsResult)) {
@@ -636,12 +634,6 @@
$myrow['description'],
locale_number_format($myrow['qoh'],$myrow['decimalplaces']),
$myrow['units']);
-
- $j++;
- if ($j == 12){
- $j=1;
- echo $TableHeader;
- }
//end of page full new headings if
}
//end of while loop
@@ -855,38 +847,38 @@
echo '<table cellpadding="2" width="95%" class="selection">';
if (isset($_POST['Quotations']) AND $_POST['Quotations']=='Orders_Only'){
- $tableheader = '<tr>
+ $TableHeader = '<tr>
<th>' . _('Modify') . '</th>
<th>' . _('Invoice') . '</th>
<th>' . _('Dispatch Note') . '</th>
- <th>' . _('Customer') . '</th>
- <th>' . _('Branch') . '</th>
- <th>' . _('Cust Order') . ' #</th>
- <th>' . _('Order Date') . '</th>
- <th>' . _('Req Del Date') . '</th>
- <th>' . _('Delivery To') . '</th>
- <th>' . _('Order Total') . '<br />' . $_SESSION['CompanyRecord']['currencydefault'] . '</th>';
+ <th class="ascending" onclick="SortSelect(this)" >' . _('Customer') . '</th>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('Branch') . '</th>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('Cust Order') . ' #</th>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('Order Date') . '</th>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('Req Del Date') . '</th>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('Delivery To') . '</th>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('Order Total') . '<br />' . $_SESSION['CompanyRecord']['currencydefault'] . '</th>';
if ($AuthRow['cancreate']==0){ //If cancreate==0 then this means the user can create orders hmmm!!
- $tableheader .= '<th>' . _('Place PO') . '</th></tr>';
+ $TableHeader .= '<th>' . _('Place PO') . '</th></tr>';
} else {
- $tableheader .= '</tr>';
+ $TableHeader .= '</tr>';
}
} else { /* displaying only quotations */
- $tableheader = '<tr>
+ $TableHeader = '<tr>
<th>' . _('Modify') . '</th>
<th>' . _('Print Quote') . '</th>
- <th>' . _('Customer') . '</th>
- <th>' . _('Branch') . '</th>
- <th>' . _('Cust Ref') . ' #</th>
- <th>' . _('Quote Date') . '</th>
- <th>' . _('Req Del Date') . '</th>
- <th>' . _('Delivery To') . '</th>
- <th>' . _('Quote Total') . '<br />' . $_SESSION['CompanyRecord']['currencydefault'] . '</th>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('Customer') . '</th>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('Branch') . '</th>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('Cust Ref') . ' #</th>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('Quote Date') . '</th>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('Req Del Date') . '</th>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('Delivery To') . '</th>
+ <th class="ascending" onclick="SortSelect(this)" >' . _('Quote Total') . '<br />' . $_SESSION['CompanyRecord']['currencydefault'] . '</th>
</tr>';
}
- echo $tableheader;
+ echo $TableHeader;
$i = 1;
$j = 1;
@@ -1003,12 +995,7 @@
$FormatedOrderValue);
}
$i++;
- $j++;
$OrdersTotal += $myrow['ordervalue'];
- if ($j == 12){
- $j=1;
- echo $tableheader;
- }
//end of page full new headings if
}//end while loop through orders to display
if ($_POST['Quotations']=='Orders_Only'
Modified: trunk/SelectSupplier.php
===================================================================
--- trunk/SelectSupplier.php 2013-08-13 03:07:05 UTC (rev 6196)
+++ trunk/SelectSupplier.php 2013-08-13 19:44:04 UTC (rev 6197)
@@ -273,19 +273,17 @@
<br />
<br />
<table cellpadding="2">';
- $tableheader = '<tr>
- <th>' . _('Code') . '</th>
- <th>' . _('Supplier Name') . '</th>
- <th>' . _('Currency') . '</th>
- <th>' . _('Address 1') . '</th>
- <th>' . _('Address 2') . '</th>
- <th>' . _('Address 3') . '</th>
- <th>' . _('Address 4') . '</th>
- <th>' . _('Telephone') . '</th>
- <th>' . _('Email') . '</th>
- </tr>';
- echo $tableheader;
- $j = 1;
+ echo '<tr>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Code') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Supplier Name') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Currency') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Address 1') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Address 2') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Address 3') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Address 4') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Telephone') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Email') . '</th>
+ </tr>';
$k = 0; //row counter to determine background colour
$RowIndex = 0;
if (DB_num_rows($result) <> 0) {
@@ -402,4 +400,4 @@
}
echo '<script type="text/javascript">defaultControl(document.forms[0].SupplierCode);</script>';
include ('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/ShopParameters.php
===================================================================
--- trunk/ShopParameters.php 2013-08-13 03:07:05 UTC (rev 6196)
+++ trunk/ShopParameters.php 2013-08-13 19:44:04 UTC (rev 6197)
@@ -73,24 +73,8 @@
if ($_SESSION['ShopStockLocations'] != $ShopStockLocations){
$SQL[] = "UPDATE config SET confvalue='" . $ShopStockLocations . "' WHERE confname='ShopStockLocations'";
}
- }
-
- if ($_SESSION['ShopShowTopCategoryMenu'] != $_POST['X_ShopShowTopCategoryMenu'] ) {
- $SQL[] = "UPDATE config SET confvalue = '".$_POST['X_ShopShowTopCategoryMenu']."' WHERE confname = 'ShopShowTopCategoryMenu'";
}
- if ($_SESSION['ShopShowLeftCategoryMenu'] != $_POST['X_ShopShowLeftCategoryMenu'] ) {
- $SQL[] = "UPDATE config SET confvalue = '".$_POST['X_ShopShowLeftCategoryMenu']."' WHERE confname = 'ShopShowLeftCategoryMenu'";
- }
-
- if ($_SESSION['ShopShowLogoAndShopName'] != $_POST['X_ShopShowLogoAndShopName'] ) {
- $SQL[] = "UPDATE config SET confvalue = '".$_POST['X_ShopShowLogoAndShopName']."' WHERE confname = 'ShopShowLogoAndShopName'";
- }
-
- if ($_SESSION['ShopShowInfoLinks'] != $_POST['X_ShopShowInfoLinks'] ) {
- $SQL[] = "UPDATE config SET confvalue = '".$_POST['X_ShopShowInfoLinks']."' WHERE confname = 'ShopShowInfoLinks'";
- }
-
if ($_SESSION['ShopAllowSurcharges'] != $_POST['X_ShopAllowSurcharges'] ) {
$SQL[] = "UPDATE config SET confvalue = '".$_POST['X_ShopAllowSurcharges']."' WHERE confname = 'ShopAllowSurcharges'";
}
@@ -177,6 +161,9 @@
}
$ErrMsg = _('The shop configuration could not be updated because');
$DbgMsg = _('The SQL that failed was:');
+
+ print_r($SQL);
+
if (sizeof($SQL) > 0 ) {
$result = DB_Txn_Begin($db);
foreach ($SQL as $SqlLine) {
@@ -367,68 +354,8 @@
<td>' . _('Select the webERP service item to use for payment surcharges to be processed as') . '</td>
</tr>';
-echo '<tr><th colspan="3">' . _('Web-Store CMS Integration Settings') . '</th></tr>';
-echo $TableHeader;
-
echo '<tr>
- <td>' . _('Show/Hide Top Sales Categories Menu') . ':</td>
- <td><select name="X_ShopShowTopCategoryMenu">';
-if ($_SESSION['ShopShowTopCategoryMenu'] == '1') {
- echo '<option selected="selected" value="1">' . _('Show') . '</option>';
- echo '<option value="0">' . _('Hide') . '</option>';
-} else {
- echo '<option selected="selected" value="0">' . _('Hide') . '</option>';
- echo '<option value="1">' . _('Show') . '</option>';
-}
-
-echo '</select></td>
- <td>' . _('Shows / Hides the horizontal sales categories menu below the webSHOP cart summary.') . '</td>
- </tr>';
-
-echo '<tr>
- <td>' . _('Show/Hide Left Sales Categories Menu') . ':</td>
- <td><select name="X_ShopShowLeftCategoryMenu">';
-if ($_SESSION['ShopShowLeftCategoryMenu'] == '1') {
- echo '<option selected="selected" value="1">' . _('Show') . '</option>';
- echo '<option value="0">' . _('Hide') . '</option>';
-} else {
- echo '<option selected="selected" value="0">' . _('Hide') . '</option>';
- echo '<option value="1">' . _('Show') . '</option>';
-}
-
-echo '</select></td>
- <td>' . _('Shows / Hides the vertical sales categories menu on the left column.') . '</td>
- </tr>';
-
-echo '<tr>
- <td>' . _('Show/Hide Logo and Shop Name') . ':</td>
- <td><select name="X_ShopShowLogoAndShopName">';
-if ($_SESSION['ShopShowLogoAndShopName'] == '1') {
- echo '<option selected="selected" value="1">' . _('Show') . '</option>';
- echo '<option value="0">' . _('Hide') . '</option>';
-} else {
- echo '<option selected="selected" value="0">' . _('Hide') . '</option>';
- echo '<option value="1">' . _('Show') . '</option>';
-}
-echo '</select></td>
- <td>' . _('Shows / Hides the logo and webSHOP names. Useful to use Hide if webSHOP is used as an iFrame in a CMS system, if the information displayed is already in the CMS system.') . '</td>
- </tr>';
-
-echo '<tr>
- <td>' . _('Show/Hide InfoLinks Menu') . ':</td>
- <td><select name="X_ShopShowInfoLinks">';
-if ($_SESSION['ShopShowInfoLinks'] == '1') {
- echo '<option selected="selected" value="1">' . _('Show') . '</option>';
- echo '<option value="0">' . _('Hide') . '</option>';
-} else {
- echo '<option selected="selected" value="0">' . _('Hide') . '</option>';
- echo '<option value="1">' . _('Show') . '</option>';
-}
-echo '</select></td>
- <td>' . _('Shows / Hides the information links menu at the footer of all the shop webpages. Useful to use Hide if webSHOP is used as an iFrame in a CMS system, if the information displayed is already in the CMS system.') . '</td>
- </tr>';
-
-echo '<tr><th colspan="3">' . _('Bank Transfer Settings') . '</th></tr>';
+ <th colspan="3">' . _('Bank Transfer Settings') . '</th></tr>';
echo $TableHeader;
echo '<tr>
@@ -638,4 +565,4 @@
</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/css/aguapop/default.css
===================================================================
--- trunk/css/aguapop/default.css 2013-08-13 03:07:05 UTC (rev 6196)
+++ trunk/css/aguapop/default.css 2013-08-13 19:44:04 UTC (rev 6197)
@@ -70,18 +70,31 @@
font-weight:normal;
padding:3px;
}
-
th.ascending {
cursor: s-resize;
- color:green;
- background: url(images/ascending.png) center right no-repeat;
}
-
th.descending {
cursor: n-resize;
- color:blue;
- background: url(images/descending.png) centre right no-repeat;
}
+th:after {
+ content: "";
+ float: right;
+ margin-top: 7px;
+ visibility: hidden;
+}
+th.ascending:after {
+ border-width: 0 4px 4px;
+ border-style: solid;
+ border-color: #000 transparent;
+ visibility: visible;
+}
+th.descending:after {
+ border-bottom: none;
+ border-left: 4px solid transparent;
+ border-right: 4px solid transparent;
+ border-top: 4px solid #000;
+ visibility: visible;
+}
th.number {
text-align: right;
font-weight: normal;
@@ -469,4 +482,4 @@
margin-top:15px;
}
-/**** END ***/
\ No newline at end of file
+/**** END ***/
Deleted: trunk/css/aguapop/images/ascending.png
===================================================================
(Binary files differ)
Deleted: trunk/css/aguapop/images/descending.png
===================================================================
(Binary files differ)
Modified: trunk/css/default/default.css
===================================================================
--- trunk/css/default/default.css 2013-08-13 03:07:05 UTC (rev 6196)
+++ trunk/css/default/default.css 2013-08-13 19:44:04 UTC (rev 6197)
@@ -54,19 +54,31 @@
background-color:#B06161;
color:white;
}
-
th.ascending {
cursor: s-resize;
- color:#B06161;
- background: url(images/ascending.png) center right no-repeat;
}
-
th.descending {
cursor: n-resize;
- color:#B06161;
- background: url(images/descending.png) centre right no-repeat;
}
-
+th:after {
+ content: "";
+ float: right;
+ margin-top: 7px;
+ visibility: hidden;
+}
+th.ascending:after {
+ border-width: 0 4px 4px;
+ border-style: solid;
+ border-color: #000 transparent;
+ visibility: visible;
+}
+th.descending:after {
+ border-bottom: none;
+ border-left: 4px solid transparent;
+ border-right: 4px solid transparent;
+ border-top: 4px solid #000;
+ visibility: visible;
+}
th.number{
text-align:right;
font-weight:normal;
Deleted: trunk/css/default/images/ascending.png
===================================================================
(Binary files differ)
Deleted: trunk/css/default/images/descending.png
===================================================================
(Binary files differ)
Modified: trunk/css/fluid/default.css
===================================================================
--- trunk/css/fluid/default.css 2013-08-13 03:07:05 UTC (rev 6196)
+++ trunk/css/fluid/default.css 2013-08-13 19:44:04 UTC (rev 6197)
@@ -56,16 +56,31 @@
color:#330000;
text-align:right;
}
-
th.ascending {
cursor: s-resize;
- background: url(images/ascending.png) center right no-repeat;
}
-
th.descending {
cursor: n-resize;
- background: url(images/descending.png) centre right no-repeat;
}
+th:after {
+ content: "";
+ float: right;
+ margin-top: 7px;
+ visibility: hidden;
+}
+th.ascending:after {
+ border-width: 0 4px 4px;
+ border-style: solid;
+ border-color: #000 transparent;
+ visibility: visible;
+}
+th.descending:after {
+ border-bottom: none;
+ border-left: 4px solid transparent;
+ border-right: 4px solid transparent;
+ border-top: 4px solid #000;
+ visibility: visible;
+}
td{
font-family:Arial, Verdana, Helvetica;
text-align:left;
Deleted: trunk/css/fluid/images/ascending.png
===================================================================
(Binary files differ)
Deleted: trunk/css/fluid/images/descending.png
===================================================================
(Binary files differ)
Modified: trunk/css/fresh/default.css
===================================================================
--- trunk/css/fresh/default.css 2013-08-13 03:07:05 UTC (rev 6196)
+++ trunk/css/fresh/default.css 2013-08-13 19:44:04 UTC (rev 6197)
@@ -77,12 +77,29 @@
}
th.ascending {
cursor: s-resize;
- background: url(images/ascending.png) center right no-repeat;
}
th.descending {
cursor: n-resize;
- background: url(images/descending.png) centre right no-repeat;
}
+th:after {
+ content: "";
+ float: right;
+ margin-top: 7px;
+ visibility: hidden;
+}
+th.ascending:after {
+ border-width: 0 4px 4px;
+ border-style: solid;
+ border-color: #000 transparent;
+ visibility: visible;
+}
+th.descending:after {
+ border-bottom: none;
+ border-left: 4px solid transparent;
+ border-right: 4px solid transparent;
+ border-top: 4px solid #000;
+ visibility: visible;
+}
td {
text-align: left;
}
@@ -486,4 +503,4 @@
clear:left; /* below */
}
-/*** END ***/
\ No newline at end of file
+/*** END ***/
Deleted: trunk/css/fresh/images/ascending.png
===================================================================
(Binary files differ)
Deleted: trunk/css/fresh/images/descending.png
===================================================================
(Binary files differ)
Modified: trunk/css/gel/default.css
===================================================================
--- trunk/css/gel/default.css 2013-08-13 03:07:05 UTC (rev 6196)
+++ trunk/css/gel/default.css 2013-08-13 19:44:04 UTC (rev 6197)
@@ -76,15 +76,29 @@
}
th.ascending {
cursor: s-resize;
- color:green;
- background: url(images/ascending.png) center right no-repeat;
}
-
th.descending {
cursor: n-resize;
- color:blue;
- background: url(images/descending.png) centre right no-repeat;
}
+th:after {
+ content: "";
+ float: right;
+ margin-top: 7px;
+ visibility: hidden;
+}
+th.ascending:after {
+ border-width: 0 4px 4px;
+ border-style: solid;
+ border-color: #000 transparent;
+ visibility: visible;
+}
+th.descending:after {
+ border-bottom: none;
+ border-left: 4px solid transparent;
+ border-right: 4px solid transparent;
+ border-top: 4px solid #000;
+ visibility: visible;
+}
td {
font-family: Arial, Verdana, Helvetica, sans-serif;
text-align: left;
@@ -528,4 +542,4 @@
margin-top:-22px; /* go up to center */
}
-/*** END ***/
\ No newline at end of file
+/*** END ***/
Deleted: trunk/css/gel/images/ascending.png
===================================================================
(Binary files differ)
Deleted: trunk/css/gel/images/descending.png
===================================================================
(Binary files differ)
Modified: trunk/css/professional/default.css
===================================================================
--- trunk/css/professional/default.css 2013-08-13 03:07:05 UTC (rev 6196)
+++ trunk/css/professional/default.css 2013-08-13 19:44:04 UTC (rev 6197)
@@ -96,12 +96,29 @@
}
th.ascending {
cursor: s-resize;
- background: url(images/ascending.png) center right no-repeat;
}
th.descending {
cursor: n-resize;
- background: url(images/descending.png) centre right no-repeat;
}
+th:after {
+ content: "";
+ float: right;
+ margin-top: 7px;
+ visibility: hidden;
+}
+th.ascending:after {
+ border-width: 0 4px 4px;
+ border-style: solid;
+ border-color: #000 transparent;
+ visibility: visible;
+}
+th.descending:after {
+ border-bottom: none;
+ border-left: 4px solid transparent;
+ border-right: 4px solid transparent;
+ border-top: 4px solid #000;
+ visibility: visible;
+}
th.number {
font-weight: normal;
background-color: #cccce5;
@@ -511,4 +528,4 @@
clear:left; /* below */
}
-/*** END ***/
\ No newline at end of file
+/*** END ***/
Deleted: trunk/css/professional/images/ascending.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/descending.png
===================================================================
(Binary files differ)
Modified: trunk/css/professional-rtl/default.css
===================================================================
--- trunk/css/professional-rtl/default.css 2013-08-13 03:07:05 UTC (rev 6196)
+++ trunk/css/professional-rtl/default.css 2013-08-13 19:44:04 UTC (rev 6197)
@@ -107,12 +107,29 @@
}
th.ascending {
cursor: s-resize;
- background: url(images/ascending.png) center right no-repeat;
}
th.descending {
cursor: n-resize;
- background: url(images/descending.png) centre right no-repeat;
}
+th:after {
+ content: "";
+ float: right;
+ margin-top: 7px;
+ visibility: hidden;
+}
+th.ascending:after {
+ border-width: 0 4px 4px;
+ border-style: solid;
+ border-color: #000 transparent;
+ visibility: visible;
+}
+th.descending:after {
+ border-bottom: none;
+ border-left: 4px solid transparent;
+ border-right: 4px solid transparent;
+ border-top: 4px solid #000;
+ visibility: visible;
+}
div.error {
background-color:#fddbdb;
color: red;
@@ -531,4 +548,4 @@
clear:right; /* below */
}
-/*** END ***/
\ No newline at end of file
+/*** END ***/
Deleted: trunk/css/professional-rtl/images/ascending.png
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/descending.png
===================================================================
(Binary files differ)
Modified: trunk/css/silverwolf/default.css
===================================================================
--- trunk/css/silverwolf/default.css 2013-08-13 03:07:05 UTC (rev 6196)
+++ trunk/css/silverwolf/default.css 2013-08-13 19:44:04 UTC (rev 6197)
@@ -78,13 +78,29 @@
}
th.ascending {
cursor: s-resize;
- background: url(images/ascending.png) center right no-repeat;
}
-
th.descending {
cursor: n-resize;
- background: url(images/descending.png) centre right no-repeat;
}
+th:after {
+ content: "";
+ float: right;
+ margin-top: 7px;
+ visibility: hidden;
+}
+th.ascending:after {
+ border-width: 0 4px 4px;
+ border-style: solid;
+ border-color: #000 transparent;
+ visibility: visible;
+}
+th.descending:after {
+ border-bottom: none;
+ border-left: 4px solid transparent;
+ border-right: 4px solid transparent;
+ border-top: 4px solid #000;
+ visibility: visible;
+}
td{
font-family:Arial, Verdana, Helvetica, sans-serif;
font-size:100%;
@@ -487,4 +503,4 @@
margin-top:-22px; /* go up to center */
}
-/*** END ***/
\ No newline at end of file
+/*** END ***/
Deleted: trunk/css/silverwolf/images/ascending.png
===================================================================
(Binary files differ)
Deleted: trunk/css/silverwolf/images/descending.png
===================================================================
(Binary files differ)
Modified: trunk/css/wood/default.css
===================================================================
--- trunk/css/wood/default.css 2013-08-13 03:07:05 UTC (rev 6196)
+++ trunk/css/wood/default.css 2013-08-13 19:44:04 UTC (rev 6197)
@@ -85,9 +85,31 @@
background-color: #800000;
color: white;
}
-th.SortableColumn {
- cursor: s-resize;
+th.ascending {
+ cursor: s-resize;
}
+th.descending {
+ cursor: n-resize;
+}
+th:after {
+ content: "";
+ float: right;
+ margin-top: 7px;
+ visibility: hidden;
+}
+th.ascending:after {
+ border-width: 0 4px 4px;
+ border-style: solid;
+ border-color: #000 transparent;
+ visibility: visible;
+}
+th.descending:after {
+ border-bottom: none;
+ border-left: 4px solid transparent;
+ border-right: 4px solid transparent;
+ border-top: 4px solid #000;
+ visibility: visible;
+}
td {
text-align: left;
}
@@ -550,4 +572,4 @@
margin-top:17px;
}
-/* END */
\ No newline at end of file
+/* END */
Deleted: trunk/css/wood/images/ascending.png
===================================================================
(Binary files differ)
Deleted: trunk/css/wood/images/descending.png
===================================================================
(Binary files differ)
Modified: trunk/includes/CountriesArray.php
===================================================================
--- trunk/includes/CountriesArray.php 2013-08-13 03:07:05 UTC (rev 6196)
+++ trunk/includes/CountriesArray.php 2013-08-13 19:44:04 UTC (rev 6197)
@@ -209,7 +209,8 @@
$CountriesArray['WS'] = _('Samoa');
$CountriesArray['YE'] = _('Yemen');
$CountriesArray['ZM'] = _('Zambia');
+$CountriesArray['ZA'] = _('South Africa');
$CountriesArray['ZW'] = _('Zimbabwe');
asort($CountriesArray);
-?>
\ No newline at end of file
+?>
Modified: trunk/javascripts/MiscFunctions.js
===================================================================
--- trunk/javascripts/MiscFunctions.js 2013-08-13 03:07:05 UTC (rev 6196)
+++ trunk/javascripts/MiscFunctions.js 2013-08-13 19:44:04 UTC (rev 6197)
@@ -252,7 +252,7 @@
direction="a";
} else {
selElem.className='ascending';
- direction="a";
+ direction="d";
}
}
}
Modified: trunk/sql/mysql/upgrade4.10-4.11.sql
===================================================================
--- trunk/sql/mysql/upgrade4.10-4.11.sql 2013-08-13 03:07:05 UTC (rev 6196)
+++ trunk/sql/mysql/upgrade4.10-4.11.sql 2013-08-13 19:44:04 UTC (rev 6197)
@@ -164,11 +164,10 @@
INSERT INTO config VALUES ('ShopShowOnlyAvailableItems','0');
INSERT INTO config VALUES ('ShopShowQOHColumn','1');
INSERT INTO config VALUES ('ShopStockLocations','');
-INSERT INTO config VALUES ('ShopShowLeftCategoryMenu','1');
+
ALTER TABLE `freightcosts` ADD `destinationcountry` VARCHAR( 40 ) NOT NULL AFTER `locationfrom`;
-INSERT INTO config VALUES ('ShopShowInfoLinks','1');
INSERT INTO config VALUES ('ShopTitle','Shop Home');
ALTER TABLE `stockmaster` CHANGE `kgs` `grossweight` DECIMAL( 20, 4 ) NOT NULL DEFAULT '0.0000';
@@ -177,9 +176,6 @@
CHANGE `brpostaddr4` `brpostaddr4` VARCHAR( 50 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '',
CHANGE `brpostaddr6` `brpostaddr6` VARCHAR( 40 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';
-INSERT INTO config VALUES ('ShopShowTopCategoryMenu','1');
-INSERT INTO config VALUES ('ShopShowLogoAndShopName','1');
-
ALTER TABLE `stockcategory` ADD `defaulttaxcatid` TINYINT NOT NULL DEFAULT '1';
ALTER TABLE `salescat` ADD `active` INT NOT NULL DEFAULT '1' COMMENT '1 if active 0 if inactive';
|
