[Noalyss-commit] [noalyss] 28/218: Task #448 : currency , EUR cannot be changed and not display

[Dany De Bontridder]

sparkyx pushed a commit to branch entreprise
in repository noalyss.

commit ca620cb2b8128e55c1b26d2a31fc9642b93e8009
Author: Dany De Bontridder <address@hidden>
Date:   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);
+    }
 
 }