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

[<rc...@us...>]

Revision: 6669
          http://sourceforge.net/p/web-erp/reponame/6669
Author:   rchacon
Date:     2014-04-05 23:31:54 +0000 (Sat, 05 Apr 2014)
Log Message:
-----------
Fixes the bug that emptied ItemDescriptionLanguages.

Modified Paths:
--------------
    trunk/StockClone.php
    trunk/Stocks.php

Modified: trunk/StockClone.php
===================================================================
--- trunk/StockClone.php	2014-04-05 14:17:50 UTC (rev 6668)
+++ trunk/StockClone.php	2014-04-05 23:31:54 UTC (rev 6669)
@@ -27,7 +27,7 @@
     prnMsg(_('To use this script it must be called with the Stock ID of the item to be cloned passed in as $OldStockID. Please use the Clone This Item option in the Items Menu.'),'error');
 }
 
-$ItemDescriptionLanguages = explode(',',$_SESSION['ItemDescriptionLanguages']);
+$ItemDescriptionLanguagesArray = explode(',',$_SESSION['ItemDescriptionLanguages']);
 
 if (isset($_POST['StockID']) && !empty($_POST['StockID']) && !isset($_POST['UpdateCategories'])) {
 	$sql = "SELECT COUNT(stockid)
@@ -322,7 +322,7 @@
 					$ErrMsg = _('Could not update the language description because');
 					$DbgMsg = _('The SQL that was used to update the language description and failed was');
 					if (count($ItemDescriptionLanguages)>0){
-						foreach ($ItemDescriptionLanguages as $DescriptionLanguage) {
+						foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
 							if ($DescriptionLanguage!=''){
 								$result = DB_query("INSERT INTO stockdescriptiontranslations VALUES('" . $_POST['StockID'] . "','" . $DescriptionLanguage . "', '" . $_POST['Description_' . str_replace('.','_',$DescriptionLanguage)] . "')",$db,$ErrMsg,$DbgMsg,true);
 							}
@@ -548,7 +548,7 @@
 						unset($_POST['Pansize']);
 						unset($_POST['StockID']);
 						//unset($_POST['OldStockID']);
-						foreach ($ItemDescriptionLanguages as $DescriptionLanguage) {
+						foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
 						unset($_POST['Description_' . str_replace('.','_',$DescriptionLanguage)]);
 						 $_POST['New']   = 1; //do not show input form again
 						}
@@ -642,7 +642,7 @@
 	$_POST['ShrinkFactor'] = $myrow['shrinkfactor'];
 
 	$sql = "SELECT descriptiontranslation, language_id FROM stockdescriptiontranslations WHERE stockid='" . $selectedStockID . "' AND (";
-	foreach ($ItemDescriptionLanguages as $DescriptionLanguage) {
+	foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
 		$sql .= "language_id='" . $DescriptionLanguage ."' OR ";
 	}
 	$sql = mb_substr($sql,0,mb_strlen($sql)-3) . ')';
@@ -664,7 +664,7 @@
             <td><input ' . (in_array('Description',$Errors) ?  'class="inputerror"' : '' ) .' type="text" name="Description" size="52" maxlength="50" value="' . $Description . '" /></td>
         </tr>';
 
-    foreach ($ItemDescriptionLanguages as $DescriptionLanguage) {
+    foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
         if ($DescriptionLanguage!=''){
             //unfortunately cannot have points in POST variables so have to mess with the language id
             $PostVariableName = 'Description_' . str_replace('.','_',$DescriptionLanguage);

Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php	2014-04-05 14:17:50 UTC (rev 6668)
+++ trunk/Stocks.php	2014-04-05 23:31:54 UTC (rev 6669)
@@ -20,13 +20,13 @@
 	$StockID = '';
 }
 
-$ItemDescriptionLanguages = explode(',',$_SESSION['ItemDescriptionLanguages']);
+$ItemDescriptionLanguagesArray = explode(',',$_SESSION['ItemDescriptionLanguages']);
 
 if (isset($_POST['NextItem'])){
 	$Result = DB_query("SELECT stockid FROM stockmaster WHERE stockid>'" . $StockID . "' ORDER BY stockid ASC LIMIT 1",$db);
 	$NextItemRow = DB_fetch_row($Result);
 	$StockID = $NextItemRow[0];
-	foreach ($ItemDescriptionLanguages as $DescriptionLanguage) {
+	foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
 		unset($_POST['Description_' . str_replace('.','_',$DescriptionLanguage)]);
 	}
 }
@@ -34,7 +34,7 @@
 	$Result = DB_query("SELECT stockid FROM stockmaster WHERE stockid<'" . $StockID . "' ORDER BY stockid DESC LIMIT 1",$db);
 	$PreviousItemRow = DB_fetch_row($Result);
 	$StockID = $PreviousItemRow[0];
-	foreach ($ItemDescriptionLanguages as $DescriptionLanguage) {
+	foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
 		unset($_POST['Description_' . str_replace('.','_',$DescriptionLanguage)]);
 	}
 }
@@ -429,7 +429,7 @@
 				$DbgMsg = _('The SQL that was used to update the language description and failed was');
 
 				if (count($ItemDescriptionLanguages)>0){
-					foreach ($ItemDescriptionLanguages as $DescriptionLanguage) {
+					foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
 						if ($DescriptionLanguage!=''){
 							$result = DB_query("DELETE FROM stockdescriptiontranslations WHERE stockid='" . $StockID . "' AND language_id='" . $DescriptionLanguage . "'",$db,$ErrMsg,$DbgMsg,true);
 							$result = DB_query("INSERT INTO stockdescriptiontranslations VALUES('" . $StockID . "','" . $DescriptionLanguage . "', '" . $_POST['Description_' . str_replace('.','_',$DescriptionLanguage)] . "')",$db,$ErrMsg,$DbgMsg,true);
@@ -624,7 +624,7 @@
 					$ErrMsg = _('Could not update the language description because');
 					$DbgMsg = _('The SQL that was used to update the language description and failed was');
 					if (count($ItemDescriptionLanguages)>0){
-						foreach ($ItemDescriptionLanguages as $DescriptionLanguage) {
+						foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
 							if ($DescriptionLanguage!=''){
 								$result = DB_query("INSERT INTO stockdescriptiontranslations VALUES('" . $StockID . "','" . $DescriptionLanguage . "', '" . $_POST['Description_' . str_replace('.','_',$DescriptionLanguage)] . "')",$db,$ErrMsg,$DbgMsg,true);
 							}
@@ -695,7 +695,7 @@
 						unset($_POST['ShrinkFactor']);
 						unset($_POST['Pansize']);
 						unset($StockID);
-						foreach ($ItemDescriptionLanguages as $DescriptionLanguage) {
+						foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
 							unset($_POST['Description_' . str_replace('.','_',$DescriptionLanguage)]);
 						}
 						$New=1;
@@ -841,7 +841,7 @@
 		unset($_POST['TaxCat']);
 		unset($_POST['DecimalPlaces']);
 		unset($_SESSION['SelectedStockItem']);
-		foreach ($ItemDescriptionLanguages as $DescriptionLanguage) {
+		foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
 			unset($_POST['Description_' . str_replace('.','_',$DescriptionLanguage)]);
 		}
 		unset($StockID);
@@ -935,7 +935,7 @@
 
 
 	$sql = "SELECT descriptiontranslation, language_id FROM stockdescriptiontranslations WHERE stockid='" . $StockID . "' AND (";
-	foreach ($ItemDescriptionLanguages as $DescriptionLanguage) {
+	foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
 		$sql .= "language_id='" . $DescriptionLanguage ."' OR ";
 	}
 	$sql = mb_substr($sql,0,mb_strlen($sql)-3) . ')';
@@ -965,7 +965,7 @@
 		<td><input ' . (in_array('Description',$Errors) ?  'class="inputerror"' : '' ) .' type="text" ' . ($New==0?'autofocus="autofocus"':'') . ' name="Description" required="required" size="52" maxlength="50" value="' . stripslashes($Description) . '" /></td>
 	</tr>';
 
-foreach ($ItemDescriptionLanguages as $DescriptionLanguage) {
+foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
 	if ($DescriptionLanguage!=''){
 		//unfortunately cannot have points in POST variables so have to mess with the language id
 		$PostVariableName = 'Description_' . str_replace('.','_',$DescriptionLanguage);