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

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

Revision: 4602
          http://web-erp.svn.sourceforge.net/web-erp/?rev=4602&view=rev
Author:   daintree
Date:     2011-06-19 10:21:11 +0000 (Sun, 19 Jun 2011)

Log Message:
-----------
various

Modified Paths:
--------------
    trunk/Credit_Invoice.php
    trunk/doc/Change.log

Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php	2011-06-18 22:27:44 UTC (rev 4601)
+++ trunk/Credit_Invoice.php	2011-06-19 10:21:11 UTC (rev 4602)
@@ -981,7 +981,7 @@
 					'" . $OrderLine->QtyDispatched . "',
 					'" . $OrderLine->DiscountPercent . "',
 					'" . $OrderLine->StandardCost . "',
-					'" . ($QtyOnHandPrior +$OrderLine->QtyDispatched)  . "'',
+					'" . ($QtyOnHandPrior +$OrderLine->QtyDispatched)  . "',
 					'" . $OrderLine->Narrative . "')";
 
 				$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Stock movement records could not be inserted because');
@@ -1502,9 +1502,9 @@
 
 		$SQL="SELECT accountcode,
 				accountname
-				FROM chartmaster, accountgroups
-				WHERE chartmaster.group_=accountgroups.groupname
-				AND ccountgroups.pandl=1 ORDER BY chartmaster.accountcode";
+				FROM chartmaster INNER JOIN accountgroups
+				ON chartmaster.group_=accountgroups.groupname
+				WHERE accountgroups.pandl=1 ORDER BY chartmaster.accountcode";
 	
 		$Result = DB_query($SQL,$db);
 

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2011-06-18 22:27:44 UTC (rev 4601)
+++ trunk/doc/Change.log	2011-06-19 10:21:11 UTC (rev 4602)
@@ -1,5 +1,6 @@
 webERP Change Log
 
+19/6/11 Phil: Credit_Invoice.php typos in quoting changes preventing posting credits on write offs also sql on gl account selection for write off
 18/6/11 Phil: Made up a includes/LanguagesArray.php to contain a list of languages and the translated name of the language - updated WWW_Users.php and UserSettings.php and CustLoginSetup.php to use this array - so the selection of a language uses the language name rather than the locale codes
 14/6/11 Phil: Added email to custcontacts and updated AddCustomerContacts.php SelectCustomer.php and Customers.php
 13/6/11 Phil: Birthdays (xhtml/indenting/quoting/casing/decimalplaces) for Areas.php, BOMInquiry.php, BOMS.php, BankAccounts.php, BankMatching.php, COGSGLPosting.php, CompanyPreferences.php, ConfirmDispatch_Invoice.php StockLocTransfer.php


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.