[Web-erp-svn] SF.net SVN: web-erp:[6592] trunk

[<dai...@us...>]

Revision: 6592
          http://sourceforge.net/p/web-erp/reponame/6592
Author:   daintree
Date:     2014-03-02 08:41:40 +0000 (Sun, 02 Mar 2014)
Log Message:
-----------
make sequence in TB a number for sorting

Modified Paths:
--------------
    trunk/AccountGroups.php
    trunk/AddCustomerNotes.php
    trunk/AddCustomerTypeNotes.php
    trunk/AgedDebtors.php
    trunk/BOMs.php
    trunk/BankAccountUsers.php
    trunk/BankMatching.php
    trunk/CopyBOM.php
    trunk/CounterReturns.php
    trunk/CounterSales.php
    trunk/Credit_Invoice.php
    trunk/CustomerAllocations.php
    trunk/CustomerBranches.php
    trunk/CustomerInquiry.php
    trunk/CustomerPurchases.php
    trunk/CustomerReceipt.php
    trunk/Customers.php
    trunk/ExchangeRateTrend.php
    trunk/FixedAssetCategories.php
    trunk/GLAccountInquiry.php
    trunk/GLProfit_Loss.php
    trunk/GLTrialBalance.php
    trunk/GLTrialBalance_csv.php
    trunk/InternalStockRequestAuthorisation.php
    trunk/InventoryPlanning.php
    trunk/InventoryValuation.php
    trunk/MaintenanceTasks.php
    trunk/PDFGrn.php
    trunk/PDFQuotation.php
    trunk/PDFReceipt.php
    trunk/PDFStockCheckComparison.php
    trunk/PO_SelectOSPurchOrder.php
    trunk/Payments.php
    trunk/PriceMatrix.php
    trunk/PrintCustStatements.php
    trunk/ReorderLevel.php
    trunk/SalesTopCustomersInquiry.php
    trunk/SelectOrderItems.php
    trunk/SelectProduct.php
    trunk/StockAdjustments.php
    trunk/StockCategories.php
    trunk/StockLocStatus.php
    trunk/StockTransfers.php
    trunk/SuppInvGRNs.php
    trunk/SuppPaymentRun.php
    trunk/Suppliers.php
    trunk/SystemParameters.php
    trunk/UserSettings.php
    trunk/WOSerialNos.php
    trunk/WorkOrderReceive.php
    trunk/WorkOrderStatus.php
    trunk/geo_displaymap_customers.php
    trunk/geo_displaymap_suppliers.php
    trunk/geocode.php
    trunk/geocode_genxml_customers.php
    trunk/includes/Add_SerialItems.php
    trunk/includes/CountriesArray.php
    trunk/includes/CurrenciesArray.php
    trunk/includes/DefineSuppTransClass.php
    trunk/includes/FreightCalculation.inc
    trunk/includes/GetPrice.inc
    trunk/includes/InputSerialItemsExisting.php
    trunk/includes/Login.php
    trunk/includes/MiscFunctions.php
    trunk/includes/PDFPickingListHeader.inc
    trunk/includes/PDFQuotationPageHeader.inc
    trunk/includes/PDFStarter.php
    trunk/includes/PDFStockComparisonPageHeader.inc
    trunk/includes/PDFTransPageHeader.inc
    trunk/includes/PDFTransPageHeaderPortrait.inc
    trunk/includes/Z_POSDataCreation.php
    trunk/includes/htmlMimeMail.php
    trunk/includes/session.inc

Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/AccountGroups.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -319,7 +319,7 @@
 
 		echo '<td>' . htmlspecialchars($myrow['groupname'], ENT_QUOTES,'UTF-8') . '</td>
 			<td>' . $myrow['sectionname'] . '</td>
-			<td>' . $myrow['sequenceintb'] . '</td>
+			<td class="number">' . $myrow['sequenceintb'] . '</td>
 			<td>' . $PandLText . '</td>
 			<td>' . $myrow['parentgroupname'] . '</td>';
 		echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?SelectedAccountGroup=' . urlencode($myrow['groupname']), ENT_QUOTES,'UTF-8') . '">' . _('Edit') . '</a></td>';

Modified: trunk/AddCustomerNotes.php
===================================================================
--- trunk/AddCustomerNotes.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/AddCustomerNotes.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -250,4 +250,4 @@
 } //end if record deleted no point displaying form to add record
 
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/AddCustomerTypeNotes.php
===================================================================
--- trunk/AddCustomerTypeNotes.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/AddCustomerTypeNotes.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -226,4 +226,4 @@
 } //end if record deleted no point displaying form to add record
 
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/AgedDebtors.php
===================================================================
--- trunk/AgedDebtors.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/AgedDebtors.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -531,4 +531,4 @@
 	}
 	include('includes/footer.inc');
 } /*end of else not PrintPDF */
-?>
+?>
\ No newline at end of file

Modified: trunk/BOMs.php
===================================================================
--- trunk/BOMs.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/BOMs.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -969,4 +969,4 @@
 }
 
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/BankAccountUsers.php
===================================================================
--- trunk/BankAccountUsers.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/BankAccountUsers.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -229,4 +229,4 @@
 }
 
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/BankMatching.php
===================================================================
--- trunk/BankMatching.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/BankMatching.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -354,4 +354,4 @@
 echo '</div>';
 echo '</form>';
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/CopyBOM.php
===================================================================
--- trunk/CopyBOM.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/CopyBOM.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -208,4 +208,4 @@
 
 	include('includes/footer.inc');
 }
-?>
+?>
\ No newline at end of file

Modified: trunk/CounterReturns.php
===================================================================
--- trunk/CounterReturns.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/CounterReturns.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -1849,4 +1849,4 @@
 }
 echo '</form>';
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/CounterSales.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -2452,4 +2452,4 @@
 	echo '</form>';
 }
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/Credit_Invoice.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -1602,4 +1602,4 @@
 echo '</div>';
 echo '</form>';
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/CustomerAllocations.php
===================================================================
--- trunk/CustomerAllocations.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/CustomerAllocations.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -631,4 +631,4 @@
 
 include('includes/footer.inc');
 
-?>
+?>
\ No newline at end of file

Modified: trunk/CustomerBranches.php
===================================================================
--- trunk/CustomerBranches.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/CustomerBranches.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -991,4 +991,4 @@
 } //end if record deleted no point displaying form to add record
 
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/CustomerInquiry.php
===================================================================
--- trunk/CustomerInquiry.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/CustomerInquiry.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -554,4 +554,4 @@
 
 echo '</table>';
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/CustomerPurchases.php
===================================================================
--- trunk/CustomerPurchases.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/CustomerPurchases.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -108,4 +108,4 @@
 echo '<br /><div class="centre"><a href="SelectCustomer.php">' . _('Return to customer selection screen') . '</a></div><br />';
 
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/CustomerReceipt.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -1240,4 +1240,4 @@
 echo '</div>';
 echo '</form>';
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/Customers.php
===================================================================
--- trunk/Customers.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/Customers.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -1199,4 +1199,4 @@
 } // end of main ifs
 
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/ExchangeRateTrend.php
===================================================================
--- trunk/ExchangeRateTrend.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/ExchangeRateTrend.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -73,4 +73,4 @@
 		</table>';
 
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/FixedAssetCategories.php
===================================================================
--- trunk/FixedAssetCategories.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/FixedAssetCategories.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -353,4 +353,4 @@
 	</form>';
 
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/GLAccountInquiry.php
===================================================================
--- trunk/GLAccountInquiry.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/GLAccountInquiry.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -336,4 +336,4 @@
 	echo '<p>' . $IntegrityReport;
 }
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/GLProfit_Loss.php
===================================================================
--- trunk/GLProfit_Loss.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/GLProfit_Loss.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -1296,4 +1296,4 @@
 echo '</form>';
 include('includes/footer.inc');
 
-?>
+?>
\ No newline at end of file

Modified: trunk/GLTrialBalance.php
===================================================================
--- trunk/GLTrialBalance.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/GLTrialBalance.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -738,4 +738,4 @@
 	</form>';
 include('includes/footer.inc');
 
-?>
+?>
\ No newline at end of file

Modified: trunk/GLTrialBalance_csv.php
===================================================================
--- trunk/GLTrialBalance_csv.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/GLTrialBalance_csv.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -80,4 +80,4 @@
 }
 echo $CSV_File;
 
-?>
+?>
\ No newline at end of file

Modified: trunk/InternalStockRequestAuthorisation.php
===================================================================
--- trunk/InternalStockRequestAuthorisation.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/InternalStockRequestAuthorisation.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -124,4 +124,4 @@
       </form>';
 
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/InventoryPlanning.php
===================================================================
--- trunk/InventoryPlanning.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/InventoryPlanning.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -456,4 +456,4 @@
 
 } /*end of else not PrintPDF */
 
-?>
+?>
\ No newline at end of file

Modified: trunk/InventoryValuation.php
===================================================================
--- trunk/InventoryValuation.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/InventoryValuation.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -298,4 +298,4 @@
 	include('includes/footer.inc');
 
 } /*end of else not PrintPDF */
-?>
+?>
\ No newline at end of file

Modified: trunk/MaintenanceTasks.php
===================================================================
--- trunk/MaintenanceTasks.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/MaintenanceTasks.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -243,4 +243,4 @@
 echo '</div>
         </form>';
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/PDFGrn.php
===================================================================
--- trunk/PDFGrn.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/PDFGrn.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -179,4 +179,4 @@
 	echo '<br /><a href="'.$RootPath.'/index.php">' .  _('Back to the menu') . '</a>';
 	include('includes/footer.inc');
 }
-?>
+?>
\ No newline at end of file

Modified: trunk/PDFQuotation.php
===================================================================
--- trunk/PDFQuotation.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/PDFQuotation.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -273,4 +273,4 @@
     $pdf->OutputI($_SESSION['DatabaseName'] . '_Quotation_' . date('Y-m-d') . '.pdf');
     $pdf->__destruct();
 }
-?>
+?>
\ No newline at end of file

Modified: trunk/PDFReceipt.php
===================================================================
--- trunk/PDFReceipt.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/PDFReceipt.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -122,4 +122,4 @@
 $LeftOvers = $pdf->addTextWrap(50,$YPos,300,$FontSize,'______________________________________________________________________________');
 
 $pdf->Output('Receipt-'.$_GET['ReceiptNumber'], 'I');
-?>
+?>
\ No newline at end of file

Modified: trunk/PDFStockCheckComparison.php
===================================================================
--- trunk/PDFStockCheckComparison.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/PDFStockCheckComparison.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -376,4 +376,4 @@
 
 } /*end of else not PrintPDF */
 
-?>
+?>
\ No newline at end of file

Modified: trunk/PO_SelectOSPurchOrder.php
===================================================================
--- trunk/PO_SelectOSPurchOrder.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/PO_SelectOSPurchOrder.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -570,4 +570,4 @@
 echo '</div>
       </form>';
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/Payments.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -1143,4 +1143,4 @@
 echo '</form>';
 
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/PriceMatrix.php
===================================================================
--- trunk/PriceMatrix.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/PriceMatrix.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -186,4 +186,4 @@
 	  </form>';
 
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/PrintCustStatements.php
===================================================================
--- trunk/PrintCustStatements.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/PrintCustStatements.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -476,4 +476,4 @@
 
 } /*end of else not PrintPDF */
 
-?>
+?>
\ No newline at end of file

Modified: trunk/ReorderLevel.php
===================================================================
--- trunk/ReorderLevel.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/ReorderLevel.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -309,4 +309,4 @@
 //	$YPos =$YPos - (2*$line_height);
 	$PageNumber++;
 } // End of PrintHeader() function
-?>
+?>
\ No newline at end of file

Modified: trunk/SalesTopCustomersInquiry.php
===================================================================
--- trunk/SalesTopCustomersInquiry.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/SalesTopCustomersInquiry.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -267,4 +267,4 @@
 
 } //end of if user hit show sales
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/SelectOrderItems.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -1930,4 +1930,4 @@
 	}#end of else not selecting a customer
 
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/SelectProduct.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -827,4 +827,4 @@
 /* end display list if there is more than one record */
 
 include ('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/StockAdjustments.php
===================================================================
--- trunk/StockAdjustments.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/StockAdjustments.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -527,4 +527,4 @@
       </div>
       </form>';
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/StockCategories.php
===================================================================
--- trunk/StockCategories.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/StockCategories.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -649,4 +649,4 @@
 	</form>';
 
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/StockLocStatus.php
===================================================================
--- trunk/StockLocStatus.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/StockLocStatus.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -339,4 +339,4 @@
       </form>';
 include('includes/footer.inc');
 
-?>
+?>
\ No newline at end of file

Modified: trunk/StockTransfers.php
===================================================================
--- trunk/StockTransfers.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/StockTransfers.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -586,4 +586,4 @@
     </div>
 	</form>';
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/SuppInvGRNs.php
===================================================================
--- trunk/SuppInvGRNs.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/SuppInvGRNs.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -308,4 +308,4 @@
 echo '</div>
       </form>';
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/SuppPaymentRun.php
===================================================================
--- trunk/SuppPaymentRun.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/SuppPaymentRun.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -376,4 +376,4 @@
           </form>';
 	include ('includes/footer.inc');
 } /*end of else not PrintPDF */
-?>
+?>
\ No newline at end of file

Modified: trunk/Suppliers.php
===================================================================
--- trunk/Suppliers.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/Suppliers.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -1080,4 +1080,4 @@
 } // end of main ifs
 
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/SystemParameters.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -1143,4 +1143,4 @@
 	</form>';
 
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/UserSettings.php
===================================================================
--- trunk/UserSettings.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/UserSettings.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -217,4 +217,4 @@
 	</form>';
 
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/WOSerialNos.php
===================================================================
--- trunk/WOSerialNos.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/WOSerialNos.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -347,5 +347,4 @@
       </form>';
 
 include('includes/footer.inc');
-
-?>
+?>
\ No newline at end of file

Modified: trunk/WorkOrderReceive.php
===================================================================
--- trunk/WorkOrderReceive.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/WorkOrderReceive.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -996,4 +996,4 @@
 echo '</form>';
 
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/WorkOrderStatus.php
===================================================================
--- trunk/WorkOrderStatus.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/WorkOrderStatus.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -135,4 +135,4 @@
 
 include('includes/footer.inc');
 
-?>
+?>
\ No newline at end of file

Modified: trunk/geo_displaymap_customers.php
===================================================================
--- trunk/geo_displaymap_customers.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/geo_displaymap_customers.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -118,4 +118,4 @@
 echo '<div class="centre"><a href="' . $RootPath . '/GeocodeSetup.php">' . _('Go to Geocode Setup') . '</a></div></p>';
 include ('includes/footer.inc');
 ?>
-</html>
+</html>
\ No newline at end of file

Modified: trunk/geo_displaymap_suppliers.php
===================================================================
--- trunk/geo_displaymap_suppliers.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/geo_displaymap_suppliers.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -118,4 +118,4 @@
 echo '<div class="centre"><a href="' . $RootPath . '/GeocodeSetup.php">' . _('Go to Geocode Setup') . '</a></div></p>';
 include ('includes/footer.inc');
 ?>
-</html>
+</html>
\ No newline at end of file

Modified: trunk/geocode.php
===================================================================
--- trunk/geocode.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/geocode.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -144,4 +144,4 @@
 }
 echo '<br /><div class="centre"><a href="' . $RootPath . '/GeocodeSetup.php">' . _('Go back to Geocode Setup') . '</a></div>';
 include ('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/geocode_genxml_customers.php
===================================================================
--- trunk/geocode_genxml_customers.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/geocode_genxml_customers.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -39,5 +39,4 @@
 
 // End XML file
 echo '</markers>';
-
 ?>
\ No newline at end of file

Modified: trunk/includes/Add_SerialItems.php
===================================================================
--- trunk/includes/Add_SerialItems.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/Add_SerialItems.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -345,4 +345,4 @@
 if (isset($_GET['Delete'])){
         unset($LineItem->SerialItems[$_GET['Delete']]);
 }
-?>
+?>
\ No newline at end of file

Modified: trunk/includes/CountriesArray.php
===================================================================
--- trunk/includes/CountriesArray.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/CountriesArray.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -213,4 +213,4 @@
 $CountriesArray['ZW'] = _('Zimbabwe');
 
 asort($CountriesArray);
-?>
+?>
\ No newline at end of file

Modified: trunk/includes/CurrenciesArray.php
===================================================================
--- trunk/includes/CurrenciesArray.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/CurrenciesArray.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -188,4 +188,4 @@
 // END: AlphabeticCode and CurrencyName data.
 
 asort($CurrencyName);
-?>
+?>
\ No newline at end of file

Modified: trunk/includes/DefineSuppTransClass.php
===================================================================
--- trunk/includes/DefineSuppTransClass.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/DefineSuppTransClass.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -514,5 +514,4 @@
 		$this->TaxGLCode = $TaxGLCode;
 	}
 }
-
-?>
+?>
\ No newline at end of file

Modified: trunk/includes/FreightCalculation.inc
===================================================================
--- trunk/includes/FreightCalculation.inc	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/FreightCalculation.inc	2014-03-02 08:41:40 UTC (rev 6592)
@@ -124,5 +124,4 @@
 	
 	return array ($CalcFreightCost, $CalcBestShipper);
 }
-
-?>
+?>
\ No newline at end of file

Modified: trunk/includes/GetPrice.inc
===================================================================
--- trunk/includes/GetPrice.inc	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/GetPrice.inc	2014-03-02 08:41:40 UTC (rev 6592)
@@ -173,4 +173,4 @@
 	}
 
 }
-?>
+?>
\ No newline at end of file

Modified: trunk/includes/InputSerialItemsExisting.php
===================================================================
--- trunk/includes/InputSerialItemsExisting.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/InputSerialItemsExisting.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -67,3 +67,4 @@
 	}
 	echo '</tr></table>';
 }
+?>
\ No newline at end of file

Modified: trunk/includes/Login.php
===================================================================
--- trunk/includes/Login.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/Login.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -113,4 +113,4 @@
 	<div style="text-align:center"><a href="https://sourceforge.net/projects/web-erp"><img src="https://sflogo.sourceforge.net/sflogo.php?group_id=70949&amp;type=8" width="80" height="15" alt="Get webERP Accounting &amp; Business Management at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a></div>
 </div>
 </body>
-</html>
+</html>
\ No newline at end of file

Modified: trunk/includes/MiscFunctions.php
===================================================================
--- trunk/includes/MiscFunctions.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/MiscFunctions.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -449,5 +449,4 @@
 	echo ' ... ' . _('completed');
 }
 
-
-?>
+?>
\ No newline at end of file

Modified: trunk/includes/PDFPickingListHeader.inc
===================================================================
--- trunk/includes/PDFPickingListHeader.inc	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/PDFPickingListHeader.inc	2014-03-02 08:41:40 UTC (rev 6592)
@@ -87,4 +87,4 @@
 $pdf->line($FormDesign->ColumnLine4->startx, $Page_Height -$FormDesign->ColumnLine4->starty,$FormDesign->ColumnLine4->endx, $Page_Height -$FormDesign->ColumnLine4->endy);
 $pdf->line($FormDesign->ColumnLine5->startx, $Page_Height -$FormDesign->ColumnLine5->starty,$FormDesign->ColumnLine5->endx, $Page_Height -$FormDesign->ColumnLine5->endy);
 
-?>
+?>
\ No newline at end of file

Modified: trunk/includes/PDFQuotationPageHeader.inc
===================================================================
--- trunk/includes/PDFQuotationPageHeader.inc	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/PDFQuotationPageHeader.inc	2014-03-02 08:41:40 UTC (rev 6592)
@@ -112,4 +112,4 @@
 $pdf->line($Page_Width-$Right_Margin, $Bottom_Margin+10,$Page_Width-$Right_Margin, $Bottom_Margin+350);
 
 $YPos -= (2*$line_height);
-?>
+?>
\ No newline at end of file

Modified: trunk/includes/PDFStarter.php
===================================================================
--- trunk/includes/PDFStarter.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/PDFStarter.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -182,5 +182,4 @@
 	$pdf->AddPage();
 	$pdf->cMargin = 0;
 /* END Brought from class.pdf.php constructor */
-
-?>
+?>
\ No newline at end of file

Modified: trunk/includes/PDFStockComparisonPageHeader.inc
===================================================================
--- trunk/includes/PDFStockComparisonPageHeader.inc	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/PDFStockComparisonPageHeader.inc	2014-03-02 08:41:40 UTC (rev 6592)
@@ -38,4 +38,4 @@
 
 $FontSize=10;
 $YPos -=(2*$line_height);
-?>
+?>
\ No newline at end of file

Modified: trunk/includes/PDFTransPageHeader.inc
===================================================================
--- trunk/includes/PDFTransPageHeader.inc	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/PDFTransPageHeader.inc	2014-03-02 08:41:40 UTC (rev 6592)
@@ -219,4 +219,4 @@
 
 $YPos -= ($line_height);
 
-?>
+?>
\ No newline at end of file

Modified: trunk/includes/PDFTransPageHeaderPortrait.inc
===================================================================
--- trunk/includes/PDFTransPageHeaderPortrait.inc	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/PDFTransPageHeaderPortrait.inc	2014-03-02 08:41:40 UTC (rev 6592)
@@ -276,4 +276,4 @@
 
 $YPos -= ($line_height);
 
-?>
+?>
\ No newline at end of file

Modified: trunk/includes/Z_POSDataCreation.php
===================================================================
--- trunk/includes/Z_POSDataCreation.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/Z_POSDataCreation.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -122,18 +122,19 @@
 	fwrite($FileHandle,"DELETE FROM stockmaster;\n");
 
 
-	$result = DB_query("SELECT stockid, categoryid, description, longdescription, units, barcode, taxcatid, decimalplaces FROM stockmaster WHERE (mbflag='B' OR mbflag='M') AND discontinued=0 AND controlled=0",$db);
+	$result = DB_query("SELECT stockid, categoryid, description, longdescription, units, barcode, taxcatid, decimalplaces, discountcategory FROM stockmaster WHERE (mbflag='B' OR mbflag='M') AND discontinued=0 AND controlled=0",$db);
 
 	while ($myrow = DB_fetch_array($result)) {
 
-		fwrite($FileHandle,"INSERT INTO stockmaster VALUES ('" . SQLite_Escape ($myrow['stockid']) . "', '" . SQLite_Escape ($myrow['categoryid']) . "', '" . SQLite_Escape ($myrow['description']) . "', '" . SQLite_Escape (str_replace("\n", '', $myrow['longdescription'])) . "', '" . SQLite_Escape ($myrow['units']) . "', '" . SQLite_Escape ($myrow['barcode']) . "', '" . $myrow['taxcatid'] . "', '" . $myrow['decimalplaces'] . "');\n");
+		fwrite($FileHandle,"INSERT INTO stockmaster VALUES ('" . SQLite_Escape($myrow['stockid']) . "', '" . SQLite_Escape($myrow['categoryid']) . "', '" . SQLite_Escape ($myrow['description']) . "', '" . SQLite_Escape(str_replace("\n", '', $myrow['longdescription'])) . "', '" . SQLite_Escape($myrow['units']) . "', '" . SQLite_Escape ($myrow['barcode']) . "', '" . $myrow['taxcatid'] . "', '" . $myrow['decimalplaces'] . "', '" . SQLite_Escape($myrow['discountcategory']) . "');\n");
 	}
 	fwrite($FileHandle,"DELETE FROM prices;\n");
+
 	$result = DB_query("SELECT prices.stockid,
 								prices.typeabbrev,
 								prices.currabrev,
 								prices.debtorno,
-								prices.price
+								MIN(prices.price) AS lowestprice
 							FROM prices INNER JOIN stockmaster
 								ON prices.stockid=stockmaster.stockid
 							WHERE (mbflag='B' OR mbflag='M')
@@ -142,26 +143,31 @@
 							AND prices.branchcode=''
 							AND prices.currabrev='" . $CurrCode . "'
 							AND prices.startdate <='" . Date('Y-m-d:23.59') . "'
-							AND (prices.enddate >='" . Date('Y-m-d:23.59') . "' OR prices.enddate='0000-00-00')",$db);
+							AND (prices.enddate >='" . Date('Y-m-d:23.59') . "' OR prices.enddate='0000-00-00')
+							GROUP BY prices.stockid,
+									prices.typeabbrev,
+									prices.currabrev,
+									prices.debtorno",$db);
 	while ($myrow = DB_fetch_array($result)) {
+		fwrite($FileHandle,"INSERT INTO prices VALUES ('" . SQLite_Escape($myrow['stockid']) . "', '" . SQLite_Escape($myrow['typeabbrev']) . "', '" . SQLite_Escape($myrow['currabrev']) . "', '" . SQLite_Escape($myrow['debtorno']) . "', '" . $myrow['lowestprice'] . "', '');\n");
+	}
 
-		fwrite($FileHandle,"INSERT INTO prices VALUES ('" . SQLite_Escape ($myrow['stockid']) . "', '" . SQLite_Escape ($myrow['typeabbrev']) . "', '" . SQLite_Escape ($myrow['currabrev']) . "', '" . SQLite_Escape ($myrow['debtorno']) . "', '" . SQLite_Escape ($myrow['price']) . "', '');\n");
+	fwrite($FileHandle,"DELETE FROM discountmatrix;\n");
+	$result = DB_query("SELECT salestype, discountcategory, quantitybreak, discountrate FROM discountmatrix",$db);
+	while ($myrow = DB_fetch_array($result)) {
+		  fwrite($FileHandle,"INSERT INTO discountmatrix VALUES ('" . SQLite_Escape($myrow['salestype']) . "', '" . SQLite_Escape($myrow['discountcategory']) . "', '" . $myrow['quantitybreak'] . "', '" . $myrow['discountrate'] . "');\n");
 	}
-		
+	
 	fwrite($FileHandle,"DELETE FROM debtorsmaster;\n");
 	$result = DB_query("SELECT debtorno, name, currcode, salestype, holdreason, paymentterms, discount, creditlimit, discountcode FROM debtorsmaster WHERE currcode='". $CurrCode . "'",$db);
 	while ($myrow = DB_fetch_array($result)) {
-
 		  fwrite($FileHandle,"INSERT INTO debtorsmaster VALUES ('" . $myrow['debtorno'] . "', '" . SQLite_Escape ($myrow['name']) . "', '" . $myrow['currcode'] . "', '" . $myrow['salestype'] . "', '" . $myrow['holdreason'] . "', '" . SQLite_Escape ($myrow['paymentterms']) . "', '" . $myrow['discount'] . "', '" . $myrow['creditlimit'] . "', '" . $myrow['discountcode'] . "');\n");
 	}
 	fwrite($FileHandle,"DELETE FROM custbranch;\n");
 	$result = DB_query("SELECT branchcode, debtorsmaster.debtorno, brname, contactname, specialinstructions,taxgroupid FROM custbranch INNER JOIN debtorsmaster ON custbranch.debtorno=debtorsmaster.debtorno WHERE debtorsmaster.currcode='". $CurrCode . "'",$db);
 	while ($myrow = DB_fetch_array($result)) {
-
 		  fwrite($FileHandle,"INSERT INTO custbranch VALUES ('" . $myrow['branchcode'] . "', '" . $myrow['debtorno'] . "', '" . SQLite_Escape ($myrow['brname']) . "', '" . SQLite_Escape ($myrow['contactname']) . "', '" . SQLite_Escape ($myrow['specialinstructions']) . "', '" . $myrow['taxgroupid'] . "');\n");
-
 	}
-
 	fclose($FileHandle);
 	/*Now compress to a zip archive */
 	if (file_exists($PathPrefix . $ReportDir . '/POS.sql.zip')){

Modified: trunk/includes/htmlMimeMail.php
===================================================================
--- trunk/includes/htmlMimeMail.php	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/htmlMimeMail.php	2014-03-02 08:41:40 UTC (rev 6592)
@@ -776,4 +776,4 @@
 		return implode(CRLF, $headers) . CRLF . CRLF . $this->output;
 	}
 } // End of class.
-?>
+?>
\ No newline at end of file

Modified: trunk/includes/session.inc
===================================================================
--- trunk/includes/session.inc	2014-03-01 16:03:37 UTC (rev 6591)
+++ trunk/includes/session.inc	2014-03-02 08:41:40 UTC (rev 6592)
@@ -342,5 +342,4 @@
 		exit;
 	}
 }
-
-?>
+?>
\ No newline at end of file