lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Date not converted correctly when using web service

Browse Source
This commit is contained in:
Laurent Destailleur 2012-07-12 17:07:56 +02:00
parent bea1a50e2c
commit ee8b80813a
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/facture/class/facture.class.php
View File

@ -1313,6 +1313,8 @@ class Facture extends CommonInvoice
$sqltemp.= ' FROM '.MAIN_DB_PREFIX.'c_payment_term as c'; $sqltemp.= ' FROM '.MAIN_DB_PREFIX.'c_payment_term as c';
if (is_numeric($cond_reglement)) $sqltemp.= " WHERE c.rowid=".$cond_reglement; if (is_numeric($cond_reglement)) $sqltemp.= " WHERE c.rowid=".$cond_reglement;
else $sqltemp.= " WHERE c.code='".$this->db->escape($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); $resqltemp=$this->db->query($sqltemp);
if ($resqltemp) if ($resqltemp)
{ {

2
htdocs/core/lib/functions.lib.php
View File

@ -733,7 +733,7 @@ function dol_format_address($object)
* "%d %b %Y", * "%d %b %Y",
* "%d/%m/%Y %H:%M", * "%d/%m/%Y %H:%M",
* "%d/%m/%Y %H:%M:%S", * "%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 * @param string $tzoutput true=output or 'gmt' => string is for Greenwich location
* false or 'tzserver' => output string is for local PHP server TZ usage * false or 'tzserver' => output string is for local PHP server TZ usage
* 'tzuser' => output string is for local browser TZ usage * 'tzuser' => output string is for local browser TZ usage

7
htdocs/webservices/server_invoice.php
View File

@ -25,6 +25,7 @@ set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
require_once("../master.inc.php"); require_once("../master.inc.php");
require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP 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."/core/lib/ws.lib.php");
require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.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->socid=$invoice['thirdparty_id'];
$newobject->type=$invoice['type']; $newobject->type=$invoice['type'];
$newobject->ref_ext=$invoice['ref_ext']; $newobject->ref_ext=$invoice['ref_ext'];
$newobject->date=$invoice['date']; $newobject->date=dol_stringtotime($invoice['date'],'dayrfc');
$newobject->date_lim_reglement=$invoice['date_due']; $newobject->date_lim_reglement=dol_stringtotime($invoice['date_due'],'dayrfc');
$newobject->note=$invoice['note']; $newobject->note=$invoice['note'];
$newobject->note_public=$invoice['note_public']; $newobject->note_public=$invoice['note_public'];
$newobject->statut=$invoice['status']; $newobject->statut=$invoice['status'];
@ -523,7 +524,7 @@ function createInvoice($authentication,$invoice)
$newline->qty=$line['qty']; $newline->qty=$line['qty'];
$newline->fk_product=$line['product_id']; $newline->fk_product=$line['product_id'];
} }
//var_dump($invoice['ref_ext']); //var_dump($newobject->date_lim_reglement); exit;
//var_dump($invoice['lines'][0]['type']); //var_dump($invoice['lines'][0]['type']);
$db->begin(); $db->begin();