X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/0956f2d427fe43c70fca245bc55ce85423b76ce8..e70a89d293b3296da1c106fa9c1ee203b4956ece:/js/kivi.Order.js?ds=sidebyside

diff --git a/js/kivi.Order.js b/js/kivi.Order.js
index 5f83a79fd..907e15bd3 100644
--- a/js/kivi.Order.js
+++ b/js/kivi.Order.js
@@ -175,6 +175,11 @@ namespace('kivi.Order', function(ns) {
   };
 
   ns.update_exchangerate = function(event) {
+    if (!ns.check_cv()) {
+      $('#order_currency_id').val($('#old_currency_id').val());
+      return;
+    }
+
     var rate_input = $('#order_exchangerate_as_null_number');
     rate_input.prop('disabled', true);
 
@@ -196,18 +201,15 @@ namespace('kivi.Order', function(ns) {
           } else {
             rate_text.text('');
             rate_input.prop('disabled', false);
-            rate_input.show().val(0);
+            rate_input.show().val('');
           }
           $('#exchangerate_settings').show();
         } else {
           $('#exchangerate_settings').hide();
         }
-        console.log(data.is_standard);
-        console.log(data.exchangerate);
-        console.log($('#old_exchangerate').val());
         if ($('#order_currency_id').val() != $('#old_currency_id').val() ||
             !data.is_standard && data.exchangerate != $('#old_exchangerate').val()) {
-          kivi.display_flash('warning', kivi.t8('You have changed the currency or exchange rate. Please update prices.'));
+          kivi.display_flash('warning', kivi.t8('You have changed the currency or exchange rate. Please check prices.'));
         }
         $('#old_currency_id').val($('#order_currency_id').val());
         $('#old_exchangerate').val(data.exchangerate);
@@ -217,7 +219,7 @@ namespace('kivi.Order', function(ns) {
 
   ns.exchangerate_changed = function(event) {
     if (kivi.parse_amount($('#order_exchangerate_as_null_number').val()) != kivi.parse_amount($('#old_exchangerate').val())) {
-      kivi.display_flash('warning', kivi.t8('You have changed the currency or exchange rate. Please update prices.'));
+      kivi.display_flash('warning', kivi.t8('You have changed the currency or exchange rate. Please check prices.'));
       $('#old_exchangerate').val($('#order_exchangerate_as_null_number').val());
     }
   };