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

[<ice...@us...>]

Revision: 6342
          http://sourceforge.net/p/web-erp/reponame/6342
Author:   icedlava
Date:     2013-10-03 06:42:40 +0000 (Thu, 03 Oct 2013)
Log Message:
-----------
PO_Items.php with non-stock items still require GL Code in case of modified order at invoice time else SQL error is generated due to invalid GL Code.

Modified Paths:
--------------
    trunk/PO_Items.php
    trunk/doc/Change.log
    trunk/doc/Manual/ManualContributors.html

Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php	2013-10-02 07:31:32 UTC (rev 6341)
+++ trunk/PO_Items.php	2013-10-03 06:42:40 UTC (rev 6342)
@@ -109,7 +109,7 @@
 				prnMsg( _('You do not have permission to authorise this purchase order').'.<br />' .  _('This order is for').' '.
 					$_SESSION['PO'.$identifier]->CurrCode . ' '. $_SESSION['PO'.$identifier]->Order_Value() .'. '.
 					$AuthMessage .
-					_('If you think this is a mistake please contact the systems administrator') . '<br />' . 
+					_('If you think this is a mistake please contact the systems administrator') . '<br />' .
 					_('The order will be created with a status of pending and will require authorisation'), 'warn');
 
 				$_SESSION['PO'.$identifier]->AllowPrintPO=0;
@@ -440,7 +440,10 @@
  /*It's not a stock item */
 
 		/*need to check GL Code is valid if GLLink is active */
-	if ($_SESSION['PO'.$identifier]->GLLink==1){
+		/* [icedlava] GL Code is required for non stock item variance in price vs purchase order when supplier invoice generated else
+		   there will be an sql error  in SupplierInvoice.php without a valid GL Code
+		*/
+	//if ($_SESSION['PO'.$identifier]->GLLink==1){
 
 		$sql = "SELECT accountname
 				FROM chartmaster
@@ -464,10 +467,10 @@
 			$myrow = DB_fetch_row($GLValidResult);
 			$GLAccountName = $myrow[0];
 		}
-	} /* dont bother checking the GL Code if there is no GL code to check ie not linked to GL */
-	else {
-		$_POST['GLCode']=0;
-	}
+	//} /* dont bother checking the GL Code if there is no GL code to check ie not linked to GL */
+	//else {
+	//	$_POST['GLCode']=0;
+	//}
 	if ($_POST['AssetID'] !='Not an Asset'){
 		$ValidAssetResult = DB_query("SELECT assetid,
 											description,

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2013-10-02 07:31:32 UTC (rev 6341)
+++ trunk/doc/Change.log	2013-10-03 06:42:40 UTC (rev 6342)
@@ -1,6 +1,7 @@
 webERP Change Log
 
-2/10/13 David Lynn: Added new field url to suppliers modified SelectSupplier.php and Suppliers.php 
+3/10/13 icedlava: PO_Items.php with non-stock items still require GL Code in case of modified order at invoice time else SQL error is generated due to invalid GL Code.
+2/10/13 David Lynn: Added new field url to suppliers modified SelectSupplier.php and Suppliers.php
 28/9/13 wh_hsn: help with regular expression to trap quotes and backslashes for data-type="no-illegal-chars"
 28/9/13 Phil: Followed Exson's example to set pattern to prevent dodgy characters in other scripts that were using a pattern that only allowed [a-zA-Z0-9] thus making it impossible to enter non latin characters.
 11/9/13 icedlava: SelectCompletedOrder.php Fix SQL typo.

Modified: trunk/doc/Manual/ManualContributors.html
===================================================================
--- trunk/doc/Manual/ManualContributors.html	2013-10-02 07:31:32 UTC (rev 6341)
+++ trunk/doc/Manual/ManualContributors.html	2013-10-03 06:42:40 UTC (rev 6342)
@@ -58,6 +58,8 @@
         <br />
         Tomáš Horáček (barcodepack)<br />
         <br />
+        Icedlava<br />
+        <br />
         Hindra Joshua<br />
         <br />
         Alan Jones<br />