From ee8b80813a3167396ed357a6a62d0490a7d41658 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 12 Jul 2012 17:07:56 +0200
Subject: [PATCH] Fix: Date not converted correctly when using web service

---
 htdocs/compta/facture/class/facture.class.php | 2 ++
 htdocs/core/lib/functions.lib.php             | 2 +-
 htdocs/webservices/server_invoice.php         | 7 ++++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 989a4d5cd19..0d101860a9f 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1313,6 +1313,8 @@ class Facture extends CommonInvoice
         $sqltemp.= ' FROM '.MAIN_DB_PREFIX.'c_payment_term as c';
         if (is_numeric($cond_reglement)) $sqltemp.= " WHERE c.rowid=".$cond_reglement;
         else $sqltemp.= " WHERE c.code='".$this->db->escape($cond_reglement)."'";
+
+        dol_syslog(get_class($this).'::calculate_date_lim_reglement sql='.$sqltemp);
         $resqltemp=$this->db->query($sqltemp);
         if ($resqltemp)
         {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 2c3f5a49a2e..07b6bbeb231 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -733,7 +733,7 @@ function dol_format_address($object)
  *										"%d %b %Y",
  *										"%d/%m/%Y %H:%M",
  *										"%d/%m/%Y %H:%M:%S",
- *										"day", "daytext", "dayhour", "dayhourldap", "dayhourtext"
+ *										"day", "daytext", "dayhour", "dayhourldap", "dayhourtext", "dayrfc", "dayhourrfc"
  * 	@param	string		$tzoutput		true=output or 'gmt' => string is for Greenwich location
  * 										false or 'tzserver' => output string is for local PHP server TZ usage
  * 										'tzuser' => output string is for local browser TZ usage
diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php
index 3694e8a52f8..16d90c220cc 100755
--- a/htdocs/webservices/server_invoice.php
+++ b/htdocs/webservices/server_invoice.php
@@ -25,6 +25,7 @@ set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
 
 require_once("../master.inc.php");
 require_once(NUSOAP_PATH.'/nusoap.php');		// Include SOAP
+require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
 
@@ -503,8 +504,8 @@ function createInvoice($authentication,$invoice)
         $newobject->socid=$invoice['thirdparty_id'];
         $newobject->type=$invoice['type'];
         $newobject->ref_ext=$invoice['ref_ext'];
-        $newobject->date=$invoice['date'];
-        $newobject->date_lim_reglement=$invoice['date_due'];
+        $newobject->date=dol_stringtotime($invoice['date'],'dayrfc');
+        $newobject->date_lim_reglement=dol_stringtotime($invoice['date_due'],'dayrfc');
         $newobject->note=$invoice['note'];
         $newobject->note_public=$invoice['note_public'];
         $newobject->statut=$invoice['status'];
@@ -523,7 +524,7 @@ function createInvoice($authentication,$invoice)
             $newline->qty=$line['qty'];
             $newline->fk_product=$line['product_id'];
         }
-        //var_dump($invoice['ref_ext']);
+        //var_dump($newobject->date_lim_reglement); exit;
         //var_dump($invoice['lines'][0]['type']);
 
         $db->begin();