[Weberp-svn] SF.net SVN: weberp:[8468] trunk

[<tim...@us...>]

Revision: 8468
          http://weberp.svn.sourceforge.net/weberp/?rev=8468&view=rev
Author:   tim_schofield
Date:     2012-01-18 14:50:28 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
Fix mistakes in adding items into the cart class

Modified Paths:
--------------
    trunk/ConfirmDispatch_Invoice.php
    trunk/includes/DefineCartClass.php
    trunk/includes/SelectOrderItems_IntoCart.inc

Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php	2012-01-18 10:38:31 UTC (rev 8467)
+++ trunk/ConfirmDispatch_Invoice.php	2012-01-18 14:50:28 UTC (rev 8468)
@@ -171,6 +171,7 @@
 												$myrow['actualdispatchdate'],
 												$myrow['qtyinvoiced'],
 												$myrow['discountcategory'],
+												0, // Discount override
 												$myrow['controlled'],
 												$myrow['serialised'],
 												$myrow['decimalplaces'],

Modified: trunk/includes/DefineCartClass.php
===================================================================
--- trunk/includes/DefineCartClass.php	2012-01-18 10:38:31 UTC (rev 8467)
+++ trunk/includes/DefineCartClass.php	2012-01-18 14:50:28 UTC (rev 8468)
@@ -106,10 +106,11 @@
 			if ($Price<0){ /*madness check - use a credit note to give money away!*/
 				$Price=0;
 			}
+			if ($LineNumber==-1) {
+				$LineNumber = $this->LineCounter;
+			}
 
-			$LineNumber = $this->LineCounter;
 
-
 			$this->LineItems[$LineNumber] = new LineDetails($LineNumber,
 															$StockID,
 															$Descr,

Modified: trunk/includes/SelectOrderItems_IntoCart.inc
===================================================================
--- trunk/includes/SelectOrderItems_IntoCart.inc	2012-01-18 10:38:31 UTC (rev 8467)
+++ trunk/includes/SelectOrderItems_IntoCart.inc	2012-01-18 14:50:28 UTC (rev 8468)
@@ -146,6 +146,7 @@
 															NULL, /*Actual Dispatch Date */
 															0, /*Qty Invoiced */
 															$myItemRow['discountcategory'],
+															0, //Discount override
 															$myItemRow['controlled'], /*Controlled - dont care */
 															$myItemRow['serialised'], /* need to know for autocreation wos */
 															$myItemRow['decimalplaces'],

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