Thread: [Weberp-svn] SF.net SVN: weberp:[5584] trunk (Page 6)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 5584
          http://weberp.svn.sourceforge.net/weberp/?rev=5584&view=rev
Author:   tim_schofield
Date:     2011-07-10 13:32:32 +0000 (Sun, 10 Jul 2011)

Log Message:
-----------
Implement the currency/decimalplaces session variable in a more logical way

Modified Paths:
--------------
    trunk/Currencies.php
    trunk/includes/GetConfig.php

Modified: trunk/Currencies.php
===================================================================

--- trunk/Currencies.php	2011-07-10 12:35:56 UTC (rev 5583)
+++ trunk/Currencies.php	2011-07-10 13:32:32 UTC (rev 5584)
@@ -62,6 +62,12 @@
 		$Errors[$i] = 'ExchangeRate';
 		$i++;
 	}
+	if (!is_numeric($_POST['DecimalPlaces'])){
+		$InputError = 1;
+	   prnMsg(_('The decimal places must be numeric'),'error');
+		$Errors[$i] = 'DecimalPlaces';
+		$i++;
+	}
 	if (mb_strlen($_POST['CurrencyName']) > 20) {
 		$InputError = 1;
 		prnMsg(_('The currency name must be 20 characters or less long'),'error');
@@ -98,6 +104,7 @@
 					currency='" . $_POST['CurrencyName'] . "',
 					country='". $_POST['Country']. "',
 					hundredsname='" . $_POST['HundredsName'] . "',
+					decimalplaces='" . $_POST['DecimalPlaces'] . "',
 					rate='" .$_POST['ExchangeRate'] . "'
 					WHERE currabrev = '" . $SelectedCurrency . "'";
 
@@ -109,11 +116,13 @@
 						currabrev,
 						country,
 						hundredsname,
+						decimalplaces,
 						rate)
 				VALUES ('" . $_POST['CurrencyName'] . "',
 					'" . $_POST['Abbreviation'] . "',
 					'" . $_POST['Country'] . "',
 					'" . $_POST['HundredsName'] .  "',
+					'" . $_POST['DecimalPlaces'] .  "',
 					'" . $_POST['ExchangeRate'] . "')";
 
 		$msg = _('The currency definition record has been added');
@@ -128,6 +137,7 @@
 	unset($_POST['Country']);
 	unset($_POST['HundredsName']);
 	unset($_POST['ExchangeRate']);
+	unset($_POST['DecimalPlaces']);
 	unset($_POST['Abbreviation']);
 
 } elseif (isset($_GET['delete'])) {
@@ -177,7 +187,13 @@
 links to delete or edit each. These will call the same page again and allow update/input
 or deletion of the records*/
 
-	$sql = "SELECT currency, currabrev, country, hundredsname, rate FROM currencies";
+	$sql = "SELECT currency,
+					currabrev,
+					country,
+					hundredsname,
+					decimalplaces,
+					rate
+				FROM currencies";
 	$result = DB_query($sql, $db);
 
 	echo '<table class=selection>';
@@ -186,6 +202,7 @@
 			<th>' . _('Currency Name') . '</th>
 			<th>' . _('Country') . '</th>
 			<th>' . _('Hundredths Name') . '</th>
+			<th>' . _('Decimal Places') . '</th>
 			<th>' . _('Exchange Rate') . '</th>
 			<th>' . _('Ex Rate - ECB') .'</th>
 			</tr>';
@@ -198,7 +215,7 @@
 		$CurrencyRatesArray = array();
 	}
 
-	while ($myrow = DB_fetch_row($result)) {
+	while ($myrow = DB_fetch_array($result)) {
 		if ($myrow[1]==$FunctionalCurrency){
 			echo '<tr bgcolor=#FFbbbb>';
 		} elseif ($k==1){
@@ -223,25 +240,27 @@
 					<td>%s</td>
 					<td class=number>%s</td>
 					<td class=number>%s</td>
+					<td class=number>%s</td>
 					<td><a href="%s&SelectedCurrency=%s">%s</a></td>
-					<td><a href="%s&SelectedCurrency=%s&delete=1">%s</a></td>
+					<td><a href="%s&SelectedCurrency=%sdelete=1">%s</a></td>
 					<td><a href="%s/ExchangeRateTrend.php?%s">' . _('Graph') . '</a></td>
 					</tr>',
 					$ImageFile,
-					$myrow[1],
-					$myrow[0],
-					$myrow[2],
-					$myrow[3],
-					number_format($myrow[4],5),
-					number_format(GetCurrencyRate($myrow[1],$CurrencyRatesArray),5),
-					$_SERVER['PHP_SELF'] . '?' . SID,
-					$myrow[1],
+					$myrow['currabrev'],
+					$myrow['currency'],
+					$myrow['country'],
+					$myrow['hundredsname'],
+					number_format($myrow['decimalplaces'],0),
+					number_format($myrow['rate'],5),
+					number_format(GetCurrencyRate($myrow['currabrev'],$CurrencyRatesArray),5),
+					$_SERVER['PHP_SELF'] . '?',
+					$myrow['currabrev'],
 					_('Edit'),
-					$_SERVER['PHP_SELF'] . '?' . SID,
-					$myrow[1],
+					$_SERVER['PHP_SELF'] . '?',
+					$myrow['currabrev'],
 					_('Delete'),
 					$rootpath,
-					SID . '&CurrencyToShow=' . $myrow[1]);
+					'CurrencyToShow=' . $myrow['currabrev']);
 		} else {
 			printf('<td><img src="%s"></td>
 					<td>%s</td>
@@ -249,13 +268,15 @@
 					<td>%s</td>
 					<td>%s</td>
 					<td class=number>%s</td>
+					<td class=number>%s</td>
 					<td colspan=4>%s</td>
 					</tr>',
 					$ImageFile,
-					$myrow[1],
-					$myrow[0],
-					$myrow[2],
-					$myrow[3],
+					$myrow['currabrev'],
+					$myrow['currency'],
+					$myrow['country'],
+					$myrow['hundredsname'],
+					$myrow['decimalplaces'],
 					1,
 					_('Functional Currency'));
 		}
@@ -283,6 +304,7 @@
 				currabrev,
 				country,
 				hundredsname,
+				decimalplaces,
 				rate
 				FROM currencies
 				WHERE currabrev='" . $SelectedCurrency . "'";
@@ -296,6 +318,7 @@
 		$_POST['CurrencyName']  = $myrow['currency'];
 		$_POST['Country']  = $myrow['country'];
 		$_POST['HundredsName']  = $myrow['hundredsname'];
+		$_POST['DecimalPlaces']  = $myrow['decimalplaces'];
 		$_POST['ExchangeRate']  = $myrow['rate'];
 
 
@@ -334,6 +357,11 @@
 	if (!isset($_POST['ExchangeRate'])) {$_POST['ExchangeRate']='';}
 	echo '<input ' . (in_array('ExchangeRate',$Errors) ?  'class="inputerror"' : '' ) .' type="text" class=number name="ExchangeRate" size=10 maxlength=9 value='. $_POST['ExchangeRate'].'>';
 	echo '</td></tr>';
+	echo '<tr><td>'._('Decimal Places to Show').':</td>';
+	echo '<td>';
+	if (!isset($_POST['DecimalPlaces'])) {$_POST['DecimalPlaces']=2;}
+	echo '<input ' . (in_array('DecimalPlaces',$Errors) ?  'class="inputerror"' : '' ) .' type="text" class=number name="DecimalPlaces" size=10 maxlength=9 value='. $_POST['DecimalPlaces'].'>';
+	echo '</td></tr>';
 	echo '</table>';
 
 	echo '<br /><div class="centre"><input type="Submit" name="submit" value='._('Enter Information').'></div>';

Modified: trunk/includes/GetConfig.php
===================================================================
--- trunk/includes/GetConfig.php	2011-07-10 12:35:56 UTC (rev 5583)
+++ trunk/includes/GetConfig.php	2011-07-10 13:32:32 UTC (rev 5584)
@@ -72,15 +72,21 @@
 					freightact,
 					gllink_debtors,
 					gllink_creditors,
-					gllink_stock,
-					decimalplaces
+					gllink_stock
 				FROM companies
-				INNER JOIN currencies ON companies.currencydefault=currencies.currabrev
 				WHERE coycode=1";
 
 	$ErrMsg = _('An error occurred accessing the database to retrieve the company information');
 	$ReadCoyResult = DB_query($sql,$db,$ErrMsg);
 
+	$sql="SELECT currabrev,
+				decimalplaces
+			FROM currencies";
+	$CurrenciesResult=DB_query($sql, $db);
+	while ($CurrenciesRow=DB_fetch_array($CurrenciesResult)) {
+		$_SESSION['Currencies'][$CurrenciesRow['currabrev']]['DecimalPlaces']=$CurrenciesRow['decimalplaces'];
+	}
+
 	if (DB_num_rows($ReadCoyResult)==0) {
       		echo '<br /><b>';
 		prnMsg( _('The company record has not yet been set up') . '</b><br />' . _('From the system setup tab select company maintenance to enter the company information and system preferences'),'error',_('CRITICAL PROBLEM'));


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




Thread: [Weberp-svn] SF.net SVN: weberp:[5584] trunk (Page 6)

weberp-svn