Merge pull request #12032 from frederic34/ficheinter_rec

duration of fichinter rec
This commit is contained in:
Laurent Destailleur 2019-10-07 13:04:34 +02:00 committed by GitHub
commit 8de5e6898d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -155,7 +155,7 @@ class FichinterRec extends Fichinter
$sql.= ", ".($this->socid >0 ? $this->socid : 'null');
$sql.= ", ".$conf->entity;
$sql.= ", '".$this->db->idate($now)."'";
$sql.= ", ".(!empty($fichintsrc->duree)?$fichintsrc->duree:'0');
$sql.= ", ".(!empty($fichintsrc->duration)?$fichintsrc->duration:'0');
$sql.= ", ".(!empty($this->description)?("'".$this->db->escape($this->description)."'"):"null");
$sql.= ", ".(!empty($fichintsrc->note_private)?("'".$this->db->escape($fichintsrc->note_private)."'"):"null");
$sql.= ", ".(!empty($fichintsrc->note_public)?("'".$this->db->escape($fichintsrc->note_public)."'"):"null");
@ -271,6 +271,7 @@ class FichinterRec extends Fichinter
$this->ref = $obj->titre;
$this->description = $obj->description;
$this->datec = $obj->datec;
$this->duration = $obj->duree;
$this->socid = $obj->fk_soc;
$this->statut = 0;
$this->fk_project = $obj->fk_projet;