Menu
▾
▴
[Weberp-cvs] SF.net SVN: web-erp:[3409] trunk
|
From: <tim...@us...> - 2010-04-07 10:06:49
|
Revision: 3409
http://web-erp.svn.sourceforge.net/web-erp/?rev=3409&view=rev
Author: tim_schofield
Date: 2010-04-07 10:06:43 +0000 (Wed, 07 Apr 2010)
Log Message:
-----------
Tim: SystemParameters.php and Currencies.php - Correct so that currency updates are only done when Automatic is chosen.
Modified Paths:
--------------
trunk/Currencies.php
trunk/SystemParameters.php
trunk/doc/Change.log.html
Modified: trunk/Currencies.php
===================================================================
--- trunk/Currencies.php 2010-04-07 10:06:04 UTC (rev 3408)
+++ trunk/Currencies.php 2010-04-07 10:06:43 UTC (rev 3409)
@@ -10,9 +10,9 @@
include('includes/SQL_CommonFunctions.inc');
if (isset($_GET['SelectedCurrency'])){
- $SelectedCurrency = $_GET['SelectedCurrency'];
+ $SelectedCurrency = $_GET['SelectedCurrency'];
} elseif (isset($_POST['SelectedCurrency'])){
- $SelectedCurrency = $_POST['SelectedCurrency'];
+ $SelectedCurrency = $_POST['SelectedCurrency'];
}
$ForceConfigReload = true;
@@ -28,13 +28,13 @@
if (isset($_POST['submit'])) {
- //initialise no input errors assumed initially before we test
- $InputError = 0;
+ //initialise no input errors assumed initially before we test
+ $InputError = 0;
- /* actions to take once the user has clicked the submit button
- ie the page has called itself with some user input */
+ /* actions to take once the user has clicked the submit button
+ ie the page has called itself with some user input */
- //first off validate inputs are sensible
+ //first off validate inputs are sensible
$i=1;
$sql="SELECT count(currabrev)
@@ -48,63 +48,63 @@
$Errors[$i] = 'Abbreviation';
$i++;
}
- if (strlen($_POST['Abbreviation']) > 3) {
- $InputError = 1;
- prnMsg(_('The currency abbreviation must be 3 characters or less long and for automated currency updates to work correctly be one of the ISO4217 currency codes'),'error');
+ if (strlen($_POST['Abbreviation']) > 3) {
+ $InputError = 1;
+ prnMsg(_('The currency abbreviation must be 3 characters or less long and for automated currency updates to work correctly be one of the ISO4217 currency codes'),'error');
$Errors[$i] = 'Abbreviation';
$i++;
- }
+ }
if (!is_numeric($_POST['ExchangeRate'])){
- $InputError = 1;
- prnMsg(_('The exchange rate must be numeric'),'error');
+ $InputError = 1;
+ prnMsg(_('The exchange rate must be numeric'),'error');
$Errors[$i] = 'ExchangeRate';
$i++;
- }
- if (strlen($_POST['CurrencyName']) > 20) {
- $InputError = 1;
- prnMsg(_('The currency name must be 20 characters or less long'),'error');
+ }
+ if (strlen($_POST['CurrencyName']) > 20) {
+ $InputError = 1;
+ prnMsg(_('The currency name must be 20 characters or less long'),'error');
$Errors[$i] = 'CurrencyName';
$i++;
- }
- if (strlen($_POST['Country']) > 50) {
- $InputError = 1;
- prnMsg(_('The currency country must be 50 characters or less long'),'error');
+ }
+ if (strlen($_POST['Country']) > 50) {
+ $InputError = 1;
+ prnMsg(_('The currency country must be 50 characters or less long'),'error');
$Errors[$i] = 'Country';
$i++;
- }
- if (strlen($_POST['HundredsName']) > 15) {
- $InputError = 1;
- prnMsg(_('The hundredths name must be 15 characters or less long'),'error');
+ }
+ if (strlen($_POST['HundredsName']) > 15) {
+ $InputError = 1;
+ prnMsg(_('The hundredths name must be 15 characters or less long'),'error');
$Errors[$i] = 'HundredsName';
$i++;
- }
- if (($FunctionalCurrency != '') and (isset($SelectedCurrency) and $SelectedCurrency==$FunctionalCurrency)){
- $InputError = 1;
- prnMsg(_('The functional currency cannot be modified or deleted'),'error');
- }
- if (strstr($_POST['Abbreviation'],"'") OR strstr($_POST['Abbreviation'],'+') OR strstr($_POST['Abbreviation'],"\"") OR strstr($_POST['Abbreviation'],'&') OR strstr($_POST['Abbreviation'],' ') OR strstr($_POST['Abbreviation'],"\\") OR strstr($_POST['Abbreviation'],'.') OR strstr($_POST['Abbreviation'],'"')) {
+ }
+ if (($FunctionalCurrency != '') and (isset($SelectedCurrency) and $SelectedCurrency==$FunctionalCurrency)){
$InputError = 1;
+ prnMsg(_('The functional currency cannot be modified or deleted'),'error');
+ }
+ if (strstr($_POST['Abbreviation'],"'") OR strstr($_POST['Abbreviation'],'+') OR strstr($_POST['Abbreviation'],"\"") OR strstr($_POST['Abbreviation'],'&') OR strstr($_POST['Abbreviation'],' ') OR strstr($_POST['Abbreviation'],"\\") OR strstr($_POST['Abbreviation'],'.') OR strstr($_POST['Abbreviation'],'"')) {
+ $InputError = 1;
prnMsg( _('The currency code cannot contain any of the following characters') . " . - ' & + \" " . _('or a space'),'error');
$Errors[$i] = 'Abbreviation';
$i++;
}
- if (isset($SelectedCurrency) AND $InputError !=1) {
+ if (isset($SelectedCurrency) AND $InputError !=1) {
- /*SelectedCurrency could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/
- $sql = "UPDATE currencies SET
+ /*SelectedCurrency could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/
+ $sql = "UPDATE currencies SET
currency='" . $_POST['CurrencyName'] . "',
country='". $_POST['Country']. "',
hundredsname='" . $_POST['HundredsName'] . "',
rate=" .$_POST['ExchangeRate'] . "
WHERE currabrev = '" . $SelectedCurrency . "'";
- $msg = _('The currency definition record has been updated');
- } else if ($InputError !=1) {
+ $msg = _('The currency definition record has been updated');
+ } else if ($InputError !=1) {
- /*Selected currencies is null cos no item selected on first time round so must be adding a record must be submitting new entries in the new payment terms form */
- $sql = "INSERT INTO currencies (currency,
- currabrev,
+ /*Selected currencies is null cos no item selected on first time round so must be adding a record must be submitting new entries in the new payment terms form */
+ $sql = "INSERT INTO currencies (currency,
+ currabrev,
country,
hundredsname,
rate)
@@ -114,58 +114,58 @@
'" . $_POST['HundredsName'] . "',
" . $_POST['ExchangeRate'] . ")";
- $msg = _('The currency definition record has been added');
- }
- //run the SQL from either of the above possibilites
- $result = DB_query($sql,$db);
- if ($InputError!=1){
- prnMsg( $msg,'success');
- }
- unset($SelectedCurrency);
- unset($_POST['CurrencyName']);
- unset($_POST['Country']);
- unset($_POST['HundredsName']);
- unset($_POST['ExchangeRate']);
- unset($_POST['Abbreviation']);
+ $msg = _('The currency definition record has been added');
+ }
+ //run the SQL from either of the above possibilites
+ $result = DB_query($sql,$db);
+ if ($InputError!=1){
+ prnMsg( $msg,'success');
+ }
+ unset($SelectedCurrency);
+ unset($_POST['CurrencyName']);
+ unset($_POST['Country']);
+ unset($_POST['HundredsName']);
+ unset($_POST['ExchangeRate']);
+ unset($_POST['Abbreviation']);
} elseif (isset($_GET['delete'])) {
//the link to delete a selected record was clicked instead of the submit button
// PREVENT DELETES IF DEPENDENT RECORDS IN DebtorsMaster
- $sql= "SELECT COUNT(*) FROM debtorsmaster WHERE debtorsmaster.currcode = '" . $SelectedCurrency . "'";
- $result = DB_query($sql,$db);
- $myrow = DB_fetch_row($result);
- if ($myrow[0] > 0)
- {
- prnMsg(_('Cannot delete this currency because customer accounts have been created referring to this currency') .
- '<br>' . _('There are') . ' ' . $myrow[0] . ' ' . _('customer accounts that refer to this currency'),'warn');
- } else {
- $sql= "SELECT COUNT(*) FROM suppliers WHERE suppliers.currcode = '$SelectedCurrency'";
- $result = DB_query($sql,$db);
- $myrow = DB_fetch_row($result);
- if ($myrow[0] > 0)
- {
- prnMsg(_('Cannot delete this currency because supplier accounts have been created referring to this currency')
- . '<br>' . _('There are') . ' ' . $myrow[0] . ' ' . _('supplier accounts that refer to this currency'),'warn');
- } else {
- $sql= "SELECT COUNT(*) FROM banktrans WHERE banktrans.currcode = '" . $SelectedCurrency . "'";
- $result = DB_query($sql,$db);
- $myrow = DB_fetch_row($result);
- if ($myrow[0] > 0){
- prnMsg(_('Cannot delete this currency because there are bank transactions that use this currency') .
- '<br>' . ' ' . _('There are') . ' ' . $myrow[0] . ' ' . _('bank transactions that refer to this currency'),'warn');
- } elseif ($FunctionalCurrency==$SelectedCurrency){
- prnMsg(_('Cannot delete this currency because it is the functional currency of the company'),'warn');
- } else {
- //only delete if used in neither customer or supplier, comp prefs, bank trans accounts
- $sql="DELETE FROM currencies WHERE currabrev='" . $SelectedCurrency . "'";
- $result = DB_query($sql,$db);
- prnMsg(_('The currency definition record has been deleted'),'success');
- }
- }
- }
- //end if currency used in customer or supplier accounts
+ $sql= "SELECT COUNT(*) FROM debtorsmaster WHERE debtorsmaster.currcode = '" . $SelectedCurrency . "'";
+ $result = DB_query($sql,$db);
+ $myrow = DB_fetch_row($result);
+ if ($myrow[0] > 0)
+ {
+ prnMsg(_('Cannot delete this currency because customer accounts have been created referring to this currency') .
+ '<br>' . _('There are') . ' ' . $myrow[0] . ' ' . _('customer accounts that refer to this currency'),'warn');
+ } else {
+ $sql= "SELECT COUNT(*) FROM suppliers WHERE suppliers.currcode = '$SelectedCurrency'";
+ $result = DB_query($sql,$db);
+ $myrow = DB_fetch_row($result);
+ if ($myrow[0] > 0)
+ {
+ prnMsg(_('Cannot delete this currency because supplier accounts have been created referring to this currency')
+ . '<br>' . _('There are') . ' ' . $myrow[0] . ' ' . _('supplier accounts that refer to this currency'),'warn');
+ } else {
+ $sql= "SELECT COUNT(*) FROM banktrans WHERE banktrans.currcode = '" . $SelectedCurrency . "'";
+ $result = DB_query($sql,$db);
+ $myrow = DB_fetch_row($result);
+ if ($myrow[0] > 0){
+ prnMsg(_('Cannot delete this currency because there are bank transactions that use this currency') .
+ '<br>' . ' ' . _('There are') . ' ' . $myrow[0] . ' ' . _('bank transactions that refer to this currency'),'warn');
+ } elseif ($FunctionalCurrency==$SelectedCurrency){
+ prnMsg(_('Cannot delete this currency because it is the functional currency of the company'),'warn');
+ } else {
+ //only delete if used in neither customer or supplier, comp prefs, bank trans accounts
+ $sql="DELETE FROM currencies WHERE currabrev='" . $SelectedCurrency . "'";
+ $result = DB_query($sql,$db);
+ prnMsg(_('The currency definition record has been deleted'),'success');
+ }
+ }
+ }
+ //end if currency used in customer or supplier accounts
}
if (!isset($SelectedCurrency)) {
@@ -175,46 +175,48 @@
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';
- $result = DB_query($sql, $db);
+ $sql = 'SELECT currency, currabrev, country, hundredsname, rate FROM currencies';
+ $result = DB_query($sql, $db);
- echo '<table border=1>';
- echo '<tr><td></td>
- <th>' . _('ISO4217 Code') . '</th>
- <th>' . _('Currency Name') . '</th>
+ echo '<table border=1>';
+ echo '<tr><td></td>
+ <th>' . _('ISO4217 Code') . '</th>
+ <th>' . _('Currency Name') . '</th>
<th>' . _('Country') . '</th>
<th>' . _('Hundredths Name') . '</th>
<th>' . _('Exchange Rate') . '</th>
<th>' . _('Ex Rate - ECB') .'</th>
</tr>';
- $k=0; //row colour counter
- /*Get published currency rates from Eurpoean Central Bank */
- $CurrencyRatesArray = GetECBCurrencyRates();
+ $k=0; //row colour counter
+ /*Get published currency rates from Eurpoean Central Bank */
+ if ($_SESSION['UpdateCurrencyRatesDaily'] != '0') {
+ $CurrencyRatesArray = GetECBCurrencyRates();
+ }
- while ($myrow = DB_fetch_row($result)) {
- if ($myrow[1]==$FunctionalCurrency){
- echo '<tr bgcolor=#FFbbbb>';
- } elseif ($k==1){
- echo '<tr class="EvenTableRows">';
- $k=0;
- } else {
- echo '<tr class="OddTableRows">';;
- $k++;
- }
- // Lets show the country flag
- $ImageFile = 'flags/' . strtoupper($myrow[1]) . '.gif';
+ while ($myrow = DB_fetch_row($result)) {
+ if ($myrow[1]==$FunctionalCurrency){
+ echo '<tr bgcolor=#FFbbbb>';
+ } elseif ($k==1){
+ echo '<tr class="EvenTableRows">';
+ $k=0;
+ } else {
+ echo '<tr class="OddTableRows">';;
+ $k++;
+ }
+ // Lets show the country flag
+ $ImageFile = 'flags/' . strtoupper($myrow[1]) . '.gif';
if(!file_exists($ImageFile)){
$ImageFile = 'flags/blank.gif';
}
- if ($myrow[1]!=$FunctionalCurrency){
- printf("<td><img src=\"%s\"></td>
- <td>%s</td>
- <td>%s</td>
+ if ($myrow[1]!=$FunctionalCurrency){
+ printf("<td><img src=\"%s\"></td>
<td>%s</td>
<td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
<td class=number>%s</td>
<td class=number>%s</td>
<td><a href=\"%s&SelectedCurrency=%s\">%s</a></td>
@@ -236,12 +238,12 @@
_('Delete'),
$rootpath,
SID . '&CurrencyToShow=' . $myrow[1]);
- } else {
- printf("<td><img src=\"%s\"></td>
- <td>%s</td>
- <td>%s</td>
+ } else {
+ printf("<td><img src=\"%s\"></td>
<td>%s</td>
<td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
<td class=number>%s</td>
<td colspan=4>%s</td>
</tr>",
@@ -252,27 +254,27 @@
$myrow[3],
1,
_('Functional Currency'));
- }
+ }
- } //END WHILE LIST LOOP
- echo '</table><br>';
+ } //END WHILE LIST LOOP
+ echo '</table><br>';
} //end of ifs and buts!
if (isset($SelectedCurrency)) {
- echo '<div class="centre"><a href=' .$_SERVER['PHP_SELF'] . '?' . SID. '>'._('Show all currency definitions').'</a></div>';
+ echo '<div class="centre"><a href=' .$_SERVER['PHP_SELF'] . '?' . SID. '>'._('Show all currency definitions').'</a></div>';
}
echo '<br>';
if (!isset($_GET['delete'])) {
- echo "<form method='post' action=" . $_SERVER['PHP_SELF'] . '?' . SID . '>';
+ echo "<form method='post' action=" . $_SERVER['PHP_SELF'] . '?' . SID . '>';
- if (isset($SelectedCurrency) AND $SelectedCurrency!='') {
- //editing an existing payment terms
+ if (isset($SelectedCurrency) AND $SelectedCurrency!='') {
+ //editing an existing payment terms
- $sql = "SELECT currency,
+ $sql = "SELECT currency,
currabrev,
country,
hundredsname,
@@ -280,58 +282,58 @@
FROM currencies
WHERE currabrev='" . $SelectedCurrency . "'";
- $ErrMsg = _('An error occurred in retrieving the currency information');;
+ $ErrMsg = _('An error occurred in retrieving the currency information');;
$result = DB_query($sql, $db, $ErrMsg);
- $myrow = DB_fetch_array($result);
+ $myrow = DB_fetch_array($result);
- $_POST['Abbreviation'] = $myrow['currabrev'];
- $_POST['CurrencyName'] = $myrow['currency'];
- $_POST['Country'] = $myrow['country'];
- $_POST['HundredsName'] = $myrow['hundredsname'];
- $_POST['ExchangeRate'] = $myrow['rate'];
+ $_POST['Abbreviation'] = $myrow['currabrev'];
+ $_POST['CurrencyName'] = $myrow['currency'];
+ $_POST['Country'] = $myrow['country'];
+ $_POST['HundredsName'] = $myrow['hundredsname'];
+ $_POST['ExchangeRate'] = $myrow['rate'];
- echo '<input type="hidden" name="SelectedCurrency" VALUE="' . $SelectedCurrency . '">';
- echo '<input type="hidden" name="Abbreviation" VALUE="' . $_POST['Abbreviation'] . '">';
- echo '<table><tr>
+ echo '<input type="hidden" name="SelectedCurrency" VALUE="' . $SelectedCurrency . '">';
+ echo '<input type="hidden" name="Abbreviation" VALUE="' . $_POST['Abbreviation'] . '">';
+ echo '<table><tr>
<td>' . _('ISO 4217 Currency Code').':</td>
<td>';
- echo $_POST['Abbreviation'] . '</td></tr>';
+ echo $_POST['Abbreviation'] . '</td></tr>';
- } else { //end of if $SelectedCurrency only do the else when a new record is being entered
+ } else { //end of if $SelectedCurrency only do the else when a new record is being entered
if (!isset($_POST['Abbreviation'])) {$_POST['Abbreviation']='';}
- echo '<table><tr>
+ echo '<table><tr>
<td>' ._('Currency Abbreviation') . ':</td>
<td><input ' . (in_array('Abbreviation',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="Abbreviation" value="' . $_POST['Abbreviation'] . '" size=4 maxlength=3></td></tr>';
- }
+ }
- echo '<tr><td>'._('Currency Name').':</td>';
- echo '<td>';
+ echo '<tr><td>'._('Currency Name').':</td>';
+ echo '<td>';
if (!isset($_POST['CurrencyName'])) {$_POST['CurrencyName']='';}
- echo '<input ' . (in_array('CurrencyName',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="CurrencyName" size=20 maxlength=20 VALUE="' . $_POST['CurrencyName'] . '">';
- echo '</td></tr>';
- echo '<tr><td>'._('Country').':</td>';
- echo '<td>';
+ echo '<input ' . (in_array('CurrencyName',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="CurrencyName" size=20 maxlength=20 VALUE="' . $_POST['CurrencyName'] . '">';
+ echo '</td></tr>';
+ echo '<tr><td>'._('Country').':</td>';
+ echo '<td>';
if (!isset($_POST['Country'])) {$_POST['Country']='';}
- echo '<input ' . (in_array('Country',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="Country" size=30 maxlength=50 VALUE="' . $_POST['Country'] . '">';
- echo '</td></tr>';
- echo '<tr><td>'._('Hundredths Name').':</td>';
- echo '<td>';
+ echo '<input ' . (in_array('Country',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="Country" size=30 maxlength=50 VALUE="' . $_POST['Country'] . '">';
+ echo '</td></tr>';
+ echo '<tr><td>'._('Hundredths Name').':</td>';
+ echo '<td>';
if (!isset($_POST['HundredsName'])) {$_POST['HundredsName']='';}
- echo '<input ' . (in_array('HundredsName',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="HundredsName" size=10 maxlength=15 VALUE="'. $_POST['HundredsName'].'">';
- echo '</td></tr>';
- echo '<tr><td>'._('Exchange Rate').':</td>';
- echo '<td>';
+ echo '<input ' . (in_array('HundredsName',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="HundredsName" size=10 maxlength=15 VALUE="'. $_POST['HundredsName'].'">';
+ echo '</td></tr>';
+ echo '<tr><td>'._('Exchange Rate').':</td>';
+ echo '<td>';
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 '</table>';
+ 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 '</table>';
- echo '<div class="centre"><input type="Submit" name="submit" value='._('Enter Information').'></div>';
+ echo '<div class="centre"><input type="Submit" name="submit" value='._('Enter Information').'></div>';
- echo '</form>';
+ echo '</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php 2010-04-07 10:06:04 UTC (rev 3408)
+++ trunk/SystemParameters.php 2010-04-07 10:06:43 UTC (rev 3409)
@@ -250,11 +250,7 @@
$sql[] = "UPDATE config SET confvalue='" . $_POST['X_LogPath'] . "' WHERE confname='LogPath'";
}
if ($_SESSION['UpdateCurrencyRatesDaily'] != $_POST['X_UpdateCurrencyRatesDaily']){
- if ($_POST['X_UpdateCurrencyRatesDaily']=='Auto'){
- $sql[] = "UPDATE config SET confvalue='" . Date('Y-m-d',mktime(0,0,0,Date('m'),Date('d')-1,Date('Y'))) . "' WHERE confname='UpdateCurrencyRatesDaily'";
- } else {
- $sql[] = "UPDATE config SET confvalue='0' WHERE confname='UpdateCurrencyRatesDaily'";
- }
+ $sql[] = "UPDATE config SET confvalue='".$_POST['X_UpdateCurrencyRatesDaily']."' WHERE confname='UpdateCurrencyRatesDaily'";
}
if ($_SESSION['FactoryManagerEmail'] != $_POST['X_FactoryManagerEmail']){
$sql[] = "UPDATE config SET confvalue='" . $_POST['X_FactoryManagerEmail'] . "' WHERE confname='FactoryManagerEmail'";
@@ -389,7 +385,7 @@
//UpdateCurrencyRatesDaily
echo '<tr><td>' . _('Auto Update Exchange Rates Daily') . ':</td>
<td><select Name="X_UpdateCurrencyRatesDaily">
- <option '.($_SESSION['UpdateCurrencyRatesDaily']!='0'?'selected ':'').'value="Auto">'._('Automatic').'
+ <option '.($_SESSION['UpdateCurrencyRatesDaily']!='0'?'selected ':'').'value="1">'._('Automatic').'
<option '.($_SESSION['UpdateCurrencyRatesDaily']=='0'?'selected ':'').'value="0">'._('Manual').'
</select></td>
<td>' . _('Automatic updates to exchange rates will retrieve the latest daily rates from the European Central Bank once per day - when the first user logs in for the day. Manual will never update the rates automatically - exchange rates will need to be maintained manually') . '</td>
@@ -632,8 +628,8 @@
<td>' . _('Picture files of items can be uploaded to the server. The system will check that files uploaded are less than this size (in KB) before they will be allowed to be uploaded. Large pictures will make the system slow and will be difficult to view in the stock maintenance screen.') .'</td>
</tr>';
//NumberOfMonthMustBeShown
-$sql = 'SELECT confvalue
- FROM `config`
+$sql = 'SELECT confvalue
+ FROM `config`
WHERE confname ="numberOfMonthMustBeShown"';
$ErrMsg = _('Could not load the Number Of Month Must be Shown');
@@ -642,7 +638,7 @@
$_SESSION['NumberOfMonthMustBeShown'] = $row['confvalue'];
echo '<tr><td>' . _('Number Of Month Must Be Shown') . ':</td>
- <td><input type="text" class="number" name="X_NumberOfMonthMustBeShown" size=4 maxlength=3 value="' . $_SESSION['NumberOfMonthMustBeShown'] . '"></td>
+ <td><input type="text" class="number" name="X_NumberOfMonthMustBeShown" size=4 maxlength=3 value="' . $_SESSION['NumberOfMonthMustBeShown'] . '"></td>
<td>' . _('Number of month must be shown on report can be changed with this parameters ex: in CustomerInquiry.php ') .'</td>
</tr>';
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-04-07 10:06:04 UTC (rev 3408)
+++ trunk/doc/Change.log.html 2010-04-07 10:06:43 UTC (rev 3409)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>07/04/10 Tim: SystemParameters.php and Currencies.php - Correct so that currency updates are only done when Automatic is chosen.</p>
<p>05/04/10 exson qu: Chinese translation update.</p>
<p>05/04/10 Matt Taylor: Z_ImportStocks.php : Correct DB_txn functions and add validation check.</p>
<p>05/04/10 Zhiguo: Japanese translation updates</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
