From 27b47a4f4836f4bbb49898187a1be06d9ca00841 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Fri, 12 Dec 2014 14:31:36 +0100
Subject: [PATCH] FIX: dont put a mess with date and datetime extrafield value
if already in right format (the bug was in propale/order/invoice extrafields,
mainly visible with 2 datetime extrafields)
---
htdocs/core/class/commonobject.class.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 5af3f5a93c3..3b7623f43ca 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2178,10 +2178,10 @@ abstract class CommonObject
$this->array_options[$key] = price2num($this->array_options[$key]);
break;
case 'date':
- $this->array_options[$key]=$this->db->idate($this->array_options[$key]);
+ if (is_numeric($this->array_options[$key])) $this->array_options[$key]=$this->db->idate($this->array_options[$key]);
break;
case 'datetime':
- $this->array_options[$key]=$this->db->idate($this->array_options[$key]);
+ if (is_numeric($this->array_options[$key])) $this->array_options[$key]=$this->db->idate($this->array_options[$key]);
break;
}
}
--
GitLab