admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Task #448 : currency , EUR cannot be changed and not display

Browse source
This commit is contained in:
Dany De Bontridder 2018-05-11 20:23:26 +02:00
parent 694c9769c3
commit ca620cb2b8
2 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/ajax/ajax_currency.php
View file

@ -101,6 +101,7 @@ switch ($act)
$currency_table->set_callback("ajax_misc.php");
$currency_table->add_json_param("op", "CurrencyManage");
/*
* we're in ajax part
*/

21
include/class/currency_mtable.class.php
View file

@ -146,8 +146,13 @@ class Currency_MTable extends Manage_Table_SQL
}
else
{
if (trim($table->str_from) =="" && trim($table->ch_value)=="")
{
// we don't add any new date
}
// -- for update, the date and value must be valid
if (trim($table->str_from)!=""&&trim($table->ch_value)!="")
elseif (trim($table->str_from)!=""&&trim($table->ch_value)!="")
{
if (isDate($table->str_from)==0)
{
@ -198,7 +203,7 @@ class Currency_MTable extends Manage_Table_SQL
$is_error++;
$this->set_error("cr_name", _("Nom trop long max=80"));
}
if ( $table->ch_value < 0 || $table->ch_value == 0) {
if ( $table->ch_value != "" && ($table->ch_value < 0 || $table->ch_value == 0)) {
$is_error++;
$this->set_error("ch_value", _("Valeur incorrecte"));
}
@ -282,5 +287,17 @@ class Currency_MTable extends Manage_Table_SQL
$this->table->ch_value=$http->request("new_rate_value");
$this->table->str_from=$http->request("new_rate_date");
}
/**
* We don't display the default currency (id := -1)
*/
function display_row($p_row)
{
if ($p_row['currency_id']==-1)
{
return;
}
parent::display_row($p_row);
}
}