diff --git a/resources/views/master.blade.php b/resources/views/master.blade.php
index a38a5218f..4a17cf29f 100644
--- a/resources/views/master.blade.php
+++ b/resources/views/master.blade.php
@@ -304,6 +304,24 @@
 <script type="text/javascript">
     NINJA.formIsChanged = {{ isset($formIsChanged) && $formIsChanged ? 'true' : 'false' }};
 
+    NINJA.parseFloat = function(str) {
+        if (! str) {
+            return '';
+        } else {
+            str = str + '';
+        }
+
+        // check for comma as decimal separator
+        if (str.match(/,[\d]{1,2}$/)) {
+            str = str.replace(',', '.');
+            str = str.replace('.', ',');
+        }
+
+        str = str.replace(/[^0-9\.\-]/g, '');
+
+        return window.parseFloat(str);
+    }
+
     $(function () {
         $('form.warn-on-exit input, form.warn-on-exit textarea, form.warn-on-exit select').change(function () {
             NINJA.formIsChanged = true;
diff --git a/resources/views/money_script.blade.php b/resources/views/money_script.blade.php
index 7cf39bced..0c498fb32 100644
--- a/resources/views/money_script.blade.php
+++ b/resources/views/money_script.blade.php
@@ -33,23 +33,6 @@
     NINJA.fontSize = {{ DEFAULT_FONT_SIZE }};
     @endif
 
-    NINJA.parseFloat = function(str) {
-        if (! str) {
-            return '';
-        } else {
-            str = str + '';
-        }
-
-        // check for comma as decimal separator
-        if (str.match(/,[\d]{1,2}$/)) {
-            str = str.replace(',', '.');
-        }
-
-        str = str.replace(/[^0-9\.\-]/g, '');
-
-        return window.parseFloat(str);
-    }
-
     function formatMoneyInvoice(value, invoice, decorator, precision) {
         var account = invoice.account;
         var client = invoice.client;