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

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

Revision: 6599
          http://sourceforge.net/p/web-erp/reponame/6599
Author:   icedlava
Date:     2014-03-05 01:05:48 +0000 (Wed, 05 Mar 2014)
Log Message:
-----------
Customers.php - Remove input fields (Country and Language) and display this data instead on customer view page

Modified Paths:
--------------
    trunk/Customers.php
    trunk/doc/Change.log

Modified: trunk/Customers.php
===================================================================
--- trunk/Customers.php	2014-03-03 04:55:30 UTC (rev 6598)
+++ trunk/Customers.php	2014-03-05 01:05:48 UTC (rev 6599)
@@ -328,7 +328,7 @@
 
 					$result = DB_query($SQL,$db);
 					$myrow = DB_fetch_row($result);
-	
+
 					if ($myrow[0]>0) {
 						prnMsg(_('Cannot delete this customer because contracts have been created that refer to it') . '. ' . _('Purge old contracts first'),'warn');
 						echo '<br />' . _('There are') . ' ' . $myrow[0] . ' '._('contracts referring to this customer');
@@ -421,7 +421,7 @@
 	$result=DB_query($sql, $db);
 	$myrow=DB_fetch_row($result);
 	if ($myrow[0]==0) {
-		prnMsg( _('In order to create a new customer you must first set up at least one sales type/price list') . '<br />' . 
+		prnMsg( _('In order to create a new customer you must first set up at least one sales type/price list') . '<br />' .
 			_('Click').' ' . '<a target="_blank" href="' . $RootPath . '/SalesTypes.php">' . _('here').' ' . '</a>' . _('to set up your price lists'),'warning') . '<br />';
 		$SetupErrors += 1;
 	}
@@ -430,7 +430,7 @@
 	$result=DB_query($sql, $db);
 	$myrow=DB_fetch_row($result);
 	if ($myrow[0]==0) {
-		prnMsg( _('In order to create a new customer you must first set up at least one customer type') . '<br />' . 
+		prnMsg( _('In order to create a new customer you must first set up at least one customer type') . '<br />' .
 			_('Click').' ' . '<a target="_blank" href="' . $RootPath . '/CustomerTypes.php">' . _('here').' ' . '</a>' . _('to set up your customer types'),'warning');
 		$SetupErrors += 1;
 	}
@@ -791,20 +791,10 @@
 			<tr>
 				<td>' . _('Address Line 5 (Postal Code)') . ':</td>
 				<td>' . $_POST['Address5'] . '</td>
-			</tr>';
-		echo '<tr>
+			</tr>
+			<tr>
 				<td>' . _('Country') . ':</td>
-				<td><select name="Address6">';
-		foreach ($CountriesArray as $CountryEntry => $CountryName){
-			if (isset($_POST['Address6']) AND (strtoupper($_POST['Address6']) == strtoupper($CountryName))){
-				echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName  . '</option>';
-			}elseif (!isset($_POST['Address6']) AND $CountryName == "") {
-				echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName  . '</option>';
-			} else {
-				echo '<option value="' . $CountryName . '">' . $CountryName  . '</option>';
-			}
-		}
-		echo '</select></td>
+				<td>' . $_POST['Address6'] . '</td>
 			</tr>';
 	} else {
 		echo '<tr>
@@ -1022,8 +1012,7 @@
 			</tr>';
 	}
 	echo '<tr>
-			<td>' . _('Language') . ':</td>
-			<td><select name="LanguageID" required="required">';
+			<td>' . _('Language') . ':</td>';
 
 	if (!isset($_POST['LanguageID']) OR $_POST['LanguageID']==''){
 		$_POST['LanguageID']=$_SESSION['Language'];
@@ -1031,12 +1020,10 @@
 
 	foreach ($LanguagesArray as $LanguageCode => $LanguageName){
 		if ($_POST['LanguageID'] == $LanguageCode){
-			echo '<option selected="selected" value="' . $LanguageCode . '">' . $LanguageName['LanguageName']  . '</option>';
-		} else {
-			echo '<option value="' . $LanguageCode . '">' . $LanguageName['LanguageName']  . '</option>';
+			echo '<td>' .  $LanguageName['LanguageName'] ;
 		}
 	}
-	echo '</select></td>
+	echo '</td>
 			</tr>';
 	echo '<tr>
 			<td>' . _('Require Customer PO Line on SO') . ':</td>';
@@ -1199,4 +1186,4 @@
 } // end of main ifs
 
 include('includes/footer.inc');
-?>
\ No newline at end of file
+?>

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2014-03-03 04:55:30 UTC (rev 6598)
+++ trunk/doc/Change.log	2014-03-05 01:05:48 UTC (rev 6599)
@@ -1,6 +1,7 @@
 webERP Change Log
+05/03/2014 icedlava: Remove input fields (Country and Language) and display this data instead on customer view page
 03/03/2014 Exson: Remove redundant code in CustomerAllocations.php
-3/3/14 icedlava: WhereUsedInquiry.php will no longer accept StockID with dash (-) as input allowed has changed. Still need to check for consistency for StockId input elsewhere in code.
+03/3/14 icedlava: WhereUsedInquiry.php will no longer accept StockID with dash (-) as input allowed has changed. Still need to check for consistency for StockId input elsewhere in code.
 2/3/14 Paul T: Div swap in footer to simplify CSS for Gel and Silverwolf themes. Some other themes will see a basic position swap of the date and version info where these vertically appeared together at the far left end.
 1/3/14 Paul T: Correct variable spelling error. [reported in forums by serakfalcon]
 24/2/14 Exson: Make negative integer allowable in MiscFunctions.js and make negative integer inputable for PastDueDays in SystemParameters.php.