Merge branch 'doctrine-mrncs' into develop

This commit is contained in:
Michael RICOIS 2017-01-12 15:37:36 +01:00
commit 30351c395e
7 changed files with 590 additions and 466 deletions

View File

@ -3094,7 +3094,7 @@ class Metier_Insee_MInsee extends Metier_Insee_Table
$tabRet['numGreffe'] = $etabG['NumGreffe'];
$tabRet['numRC'] = $etabG['NumRC2'];
$tabRet['Enseigne'] = $etabG['Enseigne'];
$iRncs = new Metier_Partenaires_MRncs($this->iDb);
$iRncs = new Metier_Partenaires_MRncs();
$tabRet['Tribunal'] = $iRncs->getCodeBodaccTribunal($etabG['NumGreffe']);
}
@ -3334,7 +3334,7 @@ class Metier_Insee_MInsee extends Metier_Insee_Table
$iGeffes = new Metier_Partenaires_MGreffes();
$etabG = $iGeffes->getIdentite($siren);
$iRncs = new Metier_Partenaires_MRncs($this->iDb);
$iRncs = new Metier_Partenaires_MRncs();
if ($this->debugtime) {
$duree=round(microtime(1)-$tdeb, 3);

View File

@ -95,7 +95,7 @@ class Metier_Partenaires_MPrivileges
$where.= " ORDER BY i.dateFraiche DESC, i.insType ASC, i.insDate ASC;";
$tables = "jo.greffes_privileges i";
$iRncs = new Metier_Partenaires_MRncs($this->iDb);
$iRncs = new Metier_Partenaires_MRncs();
$tabRet = array();
$tabPriv = $this->iDb->select($tables, $fields, $where, true, MYSQL_ASSOC);
if (count($tabPriv) > 0) {
@ -149,7 +149,7 @@ class Metier_Partenaires_MPrivileges
*/
public function getPrivilegesCumul($siren, $tabTypes=array('03', '04'))
{
$iRncs = new Metier_Partenaires_MRncs($this->iDb);
$iRncs = new Metier_Partenaires_MRncs();
$tabRet = array();
$tabTmp = $this->getPrivilegesDetail($siren, $tabTypes);

File diff suppressed because it is too large Load Diff

View File

@ -928,7 +928,7 @@ function calculIndiScore($siren, $nic=0, $accesDist=false, $cycleClient=2, $mail
/**
* Différences INSEE/RNCS
*/
$iRncs = new Metier_Partenaires_MRncs($iDb);
$iRncs = new Metier_Partenaires_MRncs();
$tabIdentiteRncs=$iRncs->getInfosEntrep($siren);
$ACTIFRNCS = $tabIdentiteRncs['actif'];
$ACTIFINSEE = $tabIdentite['Actif'];

View File

@ -873,7 +873,7 @@ class Metier_Scoring_Base extends Metier_Scoring_Vars
/**
* Différences INSEE/RNCS
*/
$iRncs = new Metier_Partenaires_MRncs($this->db);
$iRncs = new Metier_Partenaires_MRncs();
$tabIdentiteRncs = $iRncs->getInfosEntrep($siren);
$this->ACTIFRNCS = $tabIdentiteRncs['actif'];
$this->ACTIFINSEE = $tabIdentite['Actif'];

View File

@ -294,7 +294,7 @@ class Entreprise extends Scores_Ws_Server
$output = new AvisRncs();
$iDb = new Metier_Util_Db();
$rncs = new Metier_Partenaires_MRncs($iDb);
$rncs = new Metier_Partenaires_MRncs();
//jo.etablissements => insee uniquement, rncs ?

View File

@ -349,7 +349,7 @@ class Entreprise extends Scores_Ws_Server
$output = new AvisRncs();
$iDb = new Metier_Util_Db();
$rncs = new Metier_Partenaires_MRncs($iDb);
$rncs = new Metier_Partenaires_MRncs();
//jo.etablissements => insee uniquement, rncs ?