From 2ca8e2ac3fbfa3eb0942309dbae652dce3d6927c Mon Sep 17 00:00:00 2001
From: Antonio de la Rosa <webmaster@web-t-sys.com>
Date: Thu, 16 Feb 2017 03:44:23 +0100
Subject: [PATCH] Fixes in moneyfield and dateform

---
 src/CoreFields/MoneyField.php | 8 ++++++--
 src/Forms/DateForm.php        | 8 +++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/CoreFields/MoneyField.php b/src/CoreFields/MoneyField.php
index 4ef3029..f6b55aa 100644
--- a/src/CoreFields/MoneyField.php
+++ b/src/CoreFields/MoneyField.php
@@ -20,9 +20,13 @@ class MoneyField extends DoubleField{
     function check($value)
     {
         
-        $value=str_replace('.', '', $value);
+        if(strpos($value, ','))
+        {
         
-        $value=str_replace(',', '.', $value);
+            $value=str_replace('.', '', $value);
+            
+            $value=str_replace(',', '.', $value);
+        }
         
         $value=parent::check($value);
         return round($value, 2);        
diff --git a/src/Forms/DateForm.php b/src/Forms/DateForm.php
index 93a94d3..267cb34 100644
--- a/src/Forms/DateForm.php
+++ b/src/Forms/DateForm.php
@@ -11,6 +11,7 @@ class DateForm extends \PhangoApp\PhaModels\Forms\BaseForm {
 
     public $set_time=1;
     public $see_title=0;
+    public $utc=true;
 
     function form()
     {
@@ -42,7 +43,12 @@ class DateForm extends \PhangoApp\PhaModels\Forms\BaseForm {
         else
         {
         
-            $value=PhaTime\DateTime::gmt_to_local($value);
+            if($this->utc)
+            {
+        
+                $value=PhaTime\DateTime::gmt_to_local($value);
+                
+            }
                         
             list($year, $month, $day, $hour, $minute, $second)=PhaTime\DateTime::format_timedata($value);