scores/webservice
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'doctrine-mbilans' into develop

Browse Source
This commit is contained in:
Michael RICOIS 2017-01-06 11:43:34 +01:00
commit d83c25b669
6 changed files with 1906 additions and 1862 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/Metier/Insee/MInsee.php
View File

@ -3416,7 +3416,7 @@ class Metier_Insee_MInsee extends Metier_Insee_Table
}
}
if (strtoupper($entrep['typeBilan'])=='S') {
$mBil = new Metier_Partenaires_MBilans(0, $this->iDb);
$mBil = new Metier_Partenaires_MBilans();
$tabTmp = $mBil->bilanSimplifie2Normal($tabBilan);
$tabBilan = array_merge($tabTmp, $tabBilan);
}
@ -4727,7 +4727,8 @@ class Metier_Insee_MInsee extends Metier_Insee_Table
1300, 1301, 1302, 1303, 1304, 1305, 1306, 1307, 1308, 1309, 1311, 1312, 1313,
1500, 1501, 1502, 1503, 1504
))) {
$mBil = new Metier_Partenaires_MBilans($siren, $this->iDb);
$mBil = new Metier_Partenaires_MBilans();
$mBil->setSiren($siren);
$tabBilans = $mBil->listeBilans(false);
$derExercice = 0;
foreach ($tabBilans as $idx => $bilan) {
@ -4751,7 +4752,8 @@ class Metier_Insee_MInsee extends Metier_Insee_Table
}
// --- Dissolution mais bilan après événements
elseif ($rubrique == 'D') {
$mBil = new Metier_Partenaires_MBilans($siren, $this->iDb);
$mBil = new Metier_Partenaires_MBilans();
$mBil->setSiren($siren);
$tabBilans = $mBil->listeBilans(false, 3);
$derExercice = 0;
foreach ($tabBilans as $idx => $bilan) {

1094
library/Metier/Partenaires/MBilans.php
View File

File diff suppressed because it is too large Load Diff

10
library/Metier/Scores/MScores.php
View File

@ -998,10 +998,10 @@ function calculIndiScore($siren, $nic=0, $accesDist=false, $cycleClient=2, $mail
} else {
$SAISONAT='P';
}
$CAPITAL=$tabIdentite['Capital'];
$CAPITAL = $tabIdentite['Capital'];
$CAPITAL_NBACTION = $tabIdentite['CapitalNbActions'];
$CAPITAL_MTACTION = $tabIdentite['CapitalMtActions'];
if ($CAPITAL>0) {
if ($CAPITAL > 0) {
switch ($tabIdentite['CapitalType']) {
case 'V': $CAPITAL_TYPE = 'variable'; break;
case 'S': $CAPITAL_TYPE = 'fixe'; break;
@ -1049,7 +1049,8 @@ function calculIndiScore($siren, $nic=0, $accesDist=false, $cycleClient=2, $mail
// --- Liste des bilans
$tabBilan = $tabBil = $tabRegX = array();
$mBil = new Metier_Partenaires_MBilans($siren, $iDb);
$mBil = new Metier_Partenaires_MBilans();
$mBil->setSiren($siren);
$tabBilans = $mBil->listeBilans($accesDist);
$NBBILAN = count($tabBilans);
if ($NBBILAN > 0) {
@ -2207,7 +2208,8 @@ function calculIndiScore($siren, $nic=0, $accesDist=false, $cycleClient=2, $mail
$TYPEMERE='PM';
}
}
$mBilA = new Metier_Partenaires_MBilans($lien->siren, $iDb);
$mBilA = new Metier_Partenaires_MBilans();
$mBilA->setSiren($lien->siren);
$tabBilansA = $mBilA->listeBilans(false, 2);
$nbBilansA = count($tabBilansA);
if ($nbBilansA > 0) {

2635
library/Metier/Scoring/Base.php
View File

File diff suppressed because it is too large Load Diff

9
library/WsScore/Entreprise/v0.7/Service.php
View File

@ -3331,7 +3331,8 @@ class Entreprise extends Scores_Ws_Server
}
$millesime = Metier_Util_Date::dateT('Ymd','d/m/Y',$millesime);
$mBil = new Metier_Partenaires_MBilans($siren);
$mBil = new Metier_Partenaires_MBilans();
$mBil->setSiren($siren);
$tabBilan = $mBil->getBilan($millesime, $typeBilan, $ref, true);
$resultBilan = new Bilan();
@ -3376,7 +3377,8 @@ class Entreprise extends Scores_Ws_Server
$this->sendError('1010');
}
$mBil = new Metier_Partenaires_MBilans($siren);
$mBil = new Metier_Partenaires_MBilans();
$mBil->setSiren($siren);
$tabBilans = $mBil->listeBilans(true);
foreach($tabBilans as $bilan)
{
@ -3561,7 +3563,8 @@ class Entreprise extends Scores_Ws_Server
$efftr = $tabIdentite['Effectif']*1;
$fj = $tabIdentite['FJ'];
$mBil = new Metier_Partenaires_MBilans($siren);
$mBil = new Metier_Partenaires_MBilans();
$mBil->setSiren($siren);
$tabBilans = $mBil->listeBilans(true);
$nbBilans = count($tabBilans);
$tabBilan = $tabBil = array();

12
library/WsScore/Entreprise/v0.8/Service.php
View File

@ -2730,7 +2730,8 @@ class Entreprise extends Scores_Ws_Server
//Ratios
global $tva, $mBil, $efftr, $tabInfla;
require_once 'Metier/Scores/MRatios.php';
$mBil = new Metier_Partenaires_MBilans($siren);
$mBil = new Metier_Partenaires_MBilans();
$mBil->setSiren($siren);
$tabBilans = $mBil->listeBilans($accesPartenaire, 5);
$nbBilans = count($tabBilans);
$tabBilan = $tabBil = array();
@ -4250,7 +4251,8 @@ class Entreprise extends Scores_Ws_Server
}
$millesime = Metier_Util_Date::dateT('Ymd','d/m/Y',$millesime);
$mBil = new Metier_Partenaires_MBilans($siren);
$mBil = new Metier_Partenaires_MBilans();
$mBil->setSiren($siren);
$tabBilan = $mBil->getBilan($millesime, $typeBilan, $ref, true);
// --- Bilan condidentiel
@ -4315,7 +4317,8 @@ class Entreprise extends Scores_Ws_Server
$this->sendError('1010');
}
$mBil = new Metier_Partenaires_MBilans($siren);
$mBil = new Metier_Partenaires_MBilans();
$mBil->setSiren($siren);
$tabBilans = $mBil->listeBilans(true);
foreach($tabBilans as $bilan) {
$element = new ListeBilans();
@ -4627,7 +4630,8 @@ class Entreprise extends Scores_Ws_Server
}
// Ratios
$mBil = new Metier_Partenaires_MBilans($siren);
$mBil = new Metier_Partenaires_MBilans();
$mBil->setSiren($siren);
$tabBilans = $mBil->listeBilans($accesPartenaire, 5);
$nbBilans = count($tabBilans);
$tabBilan = $tabBil = array();