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

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

Revision: 4844
          http://web-erp.svn.sourceforge.net/web-erp/?rev=4844&view=rev
Author:   daintree
Date:     2012-01-27 23:11:28 +0000 (Fri, 27 Jan 2012)
Log Message:
-----------
fix link for controlled invoice lines

Modified Paths:
--------------
    trunk/ConfirmDispatch_Invoice.php
    trunk/doc/Change.log
    trunk/includes/DefineSpecialOrderClass.php

Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php	2012-01-27 16:37:31 UTC (rev 4843)
+++ trunk/ConfirmDispatch_Invoice.php	2012-01-27 23:11:28 UTC (rev 4844)
@@ -395,7 +395,7 @@
 
 	if ($LnItm->Controlled==1){
 		if (!isset($_POST['ProcessInvoice'])) {
-			echo '<td><a href="' . $rootpath . '/ConfirmDispatchControlled_Invoice.php?LineNo='. $LnItm->LineNumber.'">';
+			echo '<td><a href="' . $rootpath . '/ConfirmDispatchControlled_Invoice.php?identifier=' . $identifier . '&LineNo='. $LnItm->LineNumber.'">';
 			if ($LnItm->Serialised==1){
 				echo _('Enter Serial Numbers');
 			} else { /*Just batch/roll/lot control */

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2012-01-27 16:37:31 UTC (rev 4843)
+++ trunk/doc/Change.log	2012-01-27 23:11:28 UTC (rev 4844)
@@ -1,5 +1,7 @@
 webERP Change Log
 
+28/1/12 Phil: ConfirmDispatch_Invoice.php corrected link to ConfirmDispatchControlled_Invoice.php to send $identifier to get the correct session variable containing the order to invoice
+28/1/12 Tim: SpecialOrder.php added $identifier to session class variable to avoid overlapping sessions in multiple tabs.
 27/1/12 Phil: PO_AuthoriseMyOrders.php fixed html in hidden $_POST['StatusComments'] by using htmlentities($_POST['StatusComments'])
 25/1/12 Vitaly: Added quotes and missing closing tags in multiple files
 24/1/12 Vitaly: Added quotes to attributes in multiple files and changed option selected to selected="selected".

Modified: trunk/includes/DefineSpecialOrderClass.php
===================================================================
--- trunk/includes/DefineSpecialOrderClass.php	2012-01-27 16:37:31 UTC (rev 4843)
+++ trunk/includes/DefineSpecialOrderClass.php	2012-01-27 23:11:28 UTC (rev 4844)
@@ -37,7 +37,7 @@
 	}
 
 	function add_to_order($LineNo, $Qty, $ItemDescr, $Price, $Cost, $StkCat, $ReqDelDate){
-		if ($Qty!=0 && isset($Qty)){
+		if ($Qty!=0 AND isset($Qty)){
 			$this->LineItems[$LineNo] = new LineDetails($LineNo, $Qty, $ItemDescr, $Price, $Cost, $StkCat, $ReqDelDate);
 			$this->LinesOnOrder++;
 			Return 1;

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