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

Format

Browse Source
This commit is contained in:
Michael RICOIS 2016-12-15 11:53:36 +01:00
parent fd84706a1d
commit 14b5e2f719
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/Metier/Defaillance/DetectTable.php
View File

@ -228,7 +228,7 @@ return array(
array( 'var' => 'Situation', 'op' => 'SET', 'value' => ''),
),
),
// --- Absorbé
// --- Absorbé ?? ICI uniquement lorsque Situation = ''
array(
'name' => 'ABSORPTION',
'value' => 'CONTINUE',

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

@ -5207,13 +5207,13 @@ class Metier_Insee_MInsee extends Metier_Insee_Table
}
} else {
switch ($ann['Rubrique']) {
case 'mmd': $codeEven='2313'; $libEven = "Modification(s) diverse(s)"; break;
case 'comptes': $codeEven='3999'; $libEven = "Dépôt des comptes"; break;
case 'creations': $codeEven='4999'; $libEven = "Création d'entreprise"; break;
case 'procol': $codeEven='1999'; $libEven = "Procédure collective"; break;
case 'radiations': $codeEven='6700'; $libEven = "Radiation"; break;
case 'ventes': $codeEven='5999'; $libEven = "Vente/Cession"; break;
default: $codeEven='0000'; $libEven = $ann['Rubrique']; break;
case 'mmd': $codeEven='2313'; $libEven = "Modification(s) diverse(s)"; break;
case 'comptes': $codeEven='3999'; $libEven = "Dépôt des comptes"; break;
case 'creations': $codeEven='4999'; $libEven = "Création d'entreprise"; break;
case 'procol': $codeEven='1999'; $libEven = "Procédure collective"; break;
case 'radiations': $codeEven='6700'; $libEven = "Radiation"; break;
case 'ventes': $codeEven='5999'; $libEven = "Vente/Cession"; break;
default: $codeEven='0000'; $libEven = $ann['Rubrique']; break;
}
$tabRetEven[] = array(
'CodeEven' => $codeEven,
@ -5278,25 +5278,30 @@ class Metier_Insee_MInsee extends Metier_Insee_Table
} elseif ($ann['JAL']==200) {
$Bodacc_Code='BODB';
}
// 4xxx
if ($ann['CODEVE']<20) {
$rub='creations';
} // 4xxx
}
// 5xxx
elseif ($ann['CODEVE']<=25) {
$rub='ventes';
} // 5xxx
}
// 2xxx
elseif ($ann['CODEVE']<40) {
$rub='mmd';
} // 2xxx
}
// 6xxx
elseif ($ann['CODEVE']<42) {
$rub='radiations';
} // 6xxx
}
// 2xxx
elseif ($ann['CODEVE']<50) {
$rub='mmd';
} // 2xxx
}
// 1xxx
elseif ($ann['CODEVE']<80) {
$rub='procol';
} // 1xxx
}
$tabEvens = array();
$newCodeEven = $this->HistoEvenConvert[$ann['CODEVE']];
@ -5509,20 +5514,20 @@ class Metier_Insee_MInsee extends Metier_Insee_Table
'LibEven' => $this->iBodacc->getEvenement($even)
);
if ($even>=1000 && $even<2000) {
$rubriqueRet='procol';
$rubriqueRet = 'procol';
} elseif ($even>=2000 && $even<3000) {
$rubriqueRet='mmd';
} elseif ($even>=3000 && $even<4000) {
$rubriqueRet='comptes';
$rubriqueRet = 'comptes';
} elseif ($even>=4000 && $even<5000) {
$rubriqueRet='creations';
$rubriqueRet = 'creations';
} elseif ($even>=5000 && $even<6000) {
$rubriqueRet='ventes';
$rubriqueRet = 'ventes';
} elseif ($even>=6000 && $even<7000) {
$rubriqueRet='radiations';
$rubriqueRet = 'radiations';
}
if ($even==2102 || $even==2100) {
$capital=true;
$capital = true;
}
}
}