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

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

Revision: 7118
          http://sourceforge.net/p/web-erp/reponame/7118
Author:   daintree
Date:     2015-02-03 08:56:58 +0000 (Tue, 03 Feb 2015)
Log Message:
-----------
fix bug preventing crediting an invoice that was originally over-delivered

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

Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php	2015-02-03 08:50:09 UTC (rev 7117)
+++ trunk/Credit_Invoice.php	2015-02-03 08:56:58 UTC (rev 7118)
@@ -494,8 +494,7 @@
 	foreach($_SESSION['CreditItems' . $identifier]->LineItems as $CreditLine) {
 		$SQL = "SELECT count(*) FROM salesorderdetails WHERE orderno = '" . $_SESSION['CreditItems'.$identifier]->OrderNo . "'
 									AND stkcode = '" . $CreditLine->StockID . "'
-									AND quantity >=" . $CreditLine->QtyDispatched . "
-									AND qtyinvoiced >=" . $CreditLine->QtyDispatched;
+									AND qtyinvoiced >='" . $CreditLine->QtyDispatched . "'";
 		$ErrMsg = _('Failed to retrieve salesoderdetails to compare if the order has been invoiced and that it is possible that the credit note may not already have been done');
 		$DuplicateCreditResult = DB_query($SQL,$ErrMsg);
 		$myrow1 = DB_fetch_array($DuplicateCreditResult);

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2015-02-03 08:50:09 UTC (rev 7117)
+++ trunk/doc/Change.log	2015-02-03 08:56:58 UTC (rev 7118)
@@ -1,4 +1,7 @@
 webERP Change Log
+
+3/2/15 Phil: Added more of Andrew Galuski's QA pdf manual to the webERP html manual.
+3/2/15 Andrew Galuski: Fix bug in Credit_Invoice.php that prevented the credit note where the origianal invoice was over delivered compared to the underlying order.
 2/2/15 Exson: Remove unecessary suppliercontact sql statement which makes installation failed.
 31/01/15 RChacon: Add and modify help text. Spanish translation improvements. Standardise "Account:" to "Account".
 30/1/15 Jiro: Updated Traditional Chinese translation under zh_TW.utf8