diff --git a/library/Metier/Credit/Contact.php b/library/Metier/Credit/Contact.php index e0ee6a7e..71e22439 100644 --- a/library/Metier/Credit/Contact.php +++ b/library/Metier/Credit/Contact.php @@ -37,7 +37,8 @@ class Metier_Credit_Contact extends Scores_Ws_Server return true; } public function getlisteContacts($idUser){ - $sql='select * from sdv1.credit__contact where idUSer=:idUser;'; + $sql='select * from sdv1.credit__contact where idUSer=:idUser + and (stage<3 or (stage=3 and begin>"'.Date('Y-m-d',time()-300*24*3600).'")) order by id desc;'; $stmt = $this->conn->prepare($sql); $stmt->bindValue('idUser', $idUser); $stmt->execute(); diff --git a/library/WsScore/Entreprise/v0.8/Service.php b/library/WsScore/Entreprise/v0.8/Service.php index 0c7441aa..1d0506f2 100644 --- a/library/WsScore/Entreprise/v0.8/Service.php +++ b/library/WsScore/Entreprise/v0.8/Service.php @@ -1461,7 +1461,7 @@ class Entreprise extends Scores_Ws_Server $dirigeant->DateFct = $dir['DateFct']; //@todo : date $liste[] = $dirigeant; } - $this->wsLog('dirigeants',$siren,$option); + $this->wsLog('dirigeants',$siren,$histo); $this->logger->info( 'Nb Dirigeants retournés = '. count($dirs)); $output = new DirigeantsReturn(); $output->result = $liste; @@ -1570,7 +1570,7 @@ class Entreprise extends Scores_Ws_Server $annonce->TribunalSiret = $ann['TribunalSiret']; $annonce->Rubrique = $ann['Rubrique']; $annonce->typeAnnonce = $ann['typeAnnonce']; - $annonce->texteRectificatif = $ann['texteRectificatif']; + $annonce->texteRectificatif = isset($ann['texteRectificatif'])?$ann['texteRectificatif']:null; $annonce->texteAnnonce = $ann['texteAnnonce']; $annonce->libFJ = $ann['libFJ']; $annonce->codFJ = $ann['codFJ']; @@ -1585,7 +1585,7 @@ class Entreprise extends Scores_Ws_Server $annonce->dateJugement = $ann['dateJugement']; //@todo : date $annonce->dateInsertionSD = $ann['dateInsertionSD']; //@todo : date $annonce->evenements = $evens; - $annonce->Lien_Annonce_Pdf = $ann['Lien_Annonce_Pdf']; + $annonce->Lien_Annonce_Pdf = isset($ann['Lien_Annonce_Pdf'])?$ann['Lien_Annonce_Pdf']:null; $liste[] = $annonce; } @@ -1876,7 +1876,7 @@ class Entreprise extends Scores_Ws_Server $annonce->DateParution = $ann['DateParution']; //@todo : date $annonce->Departement = $ann['Departement']; $annonce->Tribunal = $ann['Tribunal']; - $annonce->TribunalCode = $ann['TribunalCode']; + $annonce->TribunalCode = isset($ann['TribunalCode'])?$ann['TribunalCode']:null; $annonce->TribunalSiret = $ann['TribunalSiret']; $annonce->Rubrique = $ann['Rubrique']; $annonce->typeAnnonce = $ann['typeAnnonce'];