[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 28/162: Task #448 : currency , EUR cannot be
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 28/162: Task #448 : currency , EUR cannot be changed and not display |
Date: |
Sat, 11 Jul 2020 13:23:25 -0400 (EDT) |
sparkyx pushed a commit to annotated tag E-4
in repository noalyss.
commit ca620cb2b8128e55c1b26d2a31fc9642b93e8009
Author: Dany De Bontridder <danydb@noalyss.eu>
AuthorDate: Fri May 11 20:23:26 2018 +0200
Task #448 : currency , EUR cannot be changed and not display
---
include/ajax/ajax_currency.php | 1 +
include/class/currency_mtable.class.php | 21 +++++++++++++++++++--
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/include/ajax/ajax_currency.php b/include/ajax/ajax_currency.php
index f3974db..6d11419 100644
--- a/include/ajax/ajax_currency.php
+++ b/include/ajax/ajax_currency.php
@@ -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
*/
diff --git a/include/class/currency_mtable.class.php
b/include/class/currency_mtable.class.php
index 4010596..de3afad 100644
--- a/include/class/currency_mtable.class.php
+++ b/include/class/currency_mtable.class.php
@@ -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);
+ }
}
- [Noalyss-commit] [noalyss] 25/162: Task #448 : payment method VEN, (continued)
- [Noalyss-commit] [noalyss] 25/162: Task #448 : payment method VEN, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 27/162: Task #448 : delete unused currency, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 30/162: remove debug info, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 32/162: Task #448 : SQL integrated into upgrade128, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 09/162: Currency : add security for setting, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 11/162: Currency : SQL menu change, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 20/162: Task #448 : check currency rate > 0 and payment in eur, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 22/162: Task #448 : identical operation with currency, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 24/162: Task #448 : rounded value for VEN, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 26/162: Task #448 : rounded problem add debug info, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 28/162: Task #448 : currency , EUR cannot be changed and not display,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 29/162: Task #448 : currency_id = 0 for the default currency + display currency rate in confirm operation, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 31/162: task #448 : currency always used and remove parameter 'use_currency' from parameters, add SQL script, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 35/162: Task #448 : correct bug when saving into quant_purchase, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 36/162: Bug in QUANT_PURCHASE , dp_dep_priv is not saved, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 21/162: Task #448 : issue with reconciliation amount, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 33/162: Task #448 : correct bug if VAT Rate = 0 , amount was reset, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 41/162: Fix bug quant_purchase , private fee not saved, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 42/162: remove debug, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 43/162: Missing ob_start, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 45/162: typo, Dany De Bontridder, 2020/07/11