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

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

Revision: 6686
          http://sourceforge.net/p/web-erp/reponame/6686
Author:   daintree
Date:     2014-04-19 03:09:52 +0000 (Sat, 19 Apr 2014)
Log Message:
-----------
fix mods Andrew Galuski

Modified Paths:
--------------
    trunk/ConfirmDispatch_Invoice.php
    trunk/FormDesigner.php
    trunk/GoodsReceived.php

Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php	2014-04-17 11:51:26 UTC (rev 6685)
+++ trunk/ConfirmDispatch_Invoice.php	2014-04-19 03:09:52 UTC (rev 6686)
@@ -1217,20 +1217,18 @@
 						salesanalysis.periodno,
 						salesanalysis.typeabbrev,
 						salesanalysis.salesperson
-					FROM salesanalysis,
-						custbranch,
-						stockmaster
-					WHERE salesanalysis.stkcategory=stockmaster.categoryid
-					AND salesanalysis.stockid=stockmaster.stockid
-					AND salesanalysis.cust=custbranch.debtorno
-					AND salesanalysis.custbranch=custbranch.branchcode
-					AND salesanalysis.area=custbranch.area
-					AND salesanalysis.salesperson='" . $_SESSION['Items'.$identifier]->SalesPerson . "'
+					FROM salesanalysis INNER JOIN custbranch
+						ON salesanalysis.cust=custbranch.debtorno
+						AND salesanalysis.custbranch=custbranch.branchcode
+						AND salesanalysis.area=custbranch.area
+					INNER JOIN stockmaster
+					ON salesanalysis.stkcategory=stockmaster.categoryid
+					WHERE salesanalysis.salesperson='" . $_SESSION['Items'.$identifier]->SalesPerson . "'
 					AND salesanalysis.typeabbrev ='" . $_SESSION['Items'.$identifier]->DefaultSalesType . "'
 					AND salesanalysis.periodno='" . $PeriodNo . "'
-					AND salesanalysis.cust " . LIKE . " '" . $_SESSION['Items'.$identifier]->DebtorNo . "'
-					AND salesanalysis.custbranch " . LIKE . " '" . $_SESSION['Items'.$identifier]->Branch . "'
-					AND salesanalysis.stockid " . LIKE . " '" . $OrderLine->StockID . "'
+					AND salesanalysis.cust='" . $_SESSION['Items'.$identifier]->DebtorNo . "'
+					AND salesanalysis.custbranch='" . $_SESSION['Items'.$identifier]->Branch . "'
+					AND salesanalysis.stockid='" . $OrderLine->StockID . "'
 					AND salesanalysis.budgetoractual=1
 					GROUP BY salesanalysis.stockid,
 						salesanalysis.stkcategory,
@@ -1239,7 +1237,8 @@
 						salesanalysis.area,
 						salesanalysis.periodno,
 						salesanalysis.typeabbrev,
-						salesanalysis.salesperson";
+						salesanalysis.salesperson,
+						salesanalysis.budgetoractual";
 
 			$ErrMsg = _('The count of existing Sales analysis records could not run because');
 			$DbgMsg = '<br />' .  _('SQL to count the no of sales analysis records');

Modified: trunk/FormDesigner.php
===================================================================
--- trunk/FormDesigner.php	2014-04-17 11:51:26 UTC (rev 6685)
+++ trunk/FormDesigner.php	2014-04-19 03:09:52 UTC (rev 6686)
@@ -194,8 +194,7 @@
 		while (false !== ($file = readdir($handle))) {
 			if ($file[0]!='.') {
 				$FormDesign = simplexml_load_file($PathPrefix.'companies/'.$_SESSION['DatabaseName'].'/FormDesigns/'.$file);
-				//echo "name is". $FormDesign['name'];
-				echo '<option value="'.$file.'">' . /*_(*/ $FormDesign['name'] /*)*/ . '</option>';
+				echo '<option value="'.$file.'">' . _($FormDesign['name']) . '</option>';
 			}
 		}
 		closedir($handle);

Modified: trunk/GoodsReceived.php
===================================================================
--- trunk/GoodsReceived.php	2014-04-17 11:51:26 UTC (rev 6685)
+++ trunk/GoodsReceived.php	2014-04-19 03:09:52 UTC (rev 6686)
@@ -304,7 +304,18 @@
 
 	$Changes=0;
 	$LineNo=1;
-
+	if(DB_num_rows($Result)==0){//Those goods must have been received by another user. So should destroy the session data and show warning to users
+		prnMsg(_('This order has been changed or invoiced since this delivery was started to be actioned').' . '._('Processing halted'),'error');
+		echo '<div class="centre"><a href="' . $RootPath . '/PO_SelectOSPurchOrder.php">' . 
+			_('Select a different purchase order for receiving goods against') . '</a></div>';
+		unset($_SESSION['PO'.$identifier]->LineItems);
+		unset($_SESSION['PO'.$identifier]);
+		unset($_POST['ProcessGoodsReceived']);
+		echo '</div>';
+		echo '</form>';
+		include ('includes/footer.inc');
+		exit;
+	}
 	while ($myrow = DB_fetch_array($Result)) {
 
 		if ($_SESSION['PO'.$identifier]->LineItems[$LineNo]->GLCode != $myrow['glcode'] OR