Merge branch 'develop'

This commit is contained in:
Michael RICOIS 2016-07-28 16:59:00 +02:00
commit 64e0241a79

View File

@ -91,12 +91,12 @@ class Enrichissement
'creaetab' => array(
'label' => "Date de création de l'établissement",
'column' => 'dateCrea_etab',
'sql' => "IF(dateCrea_etab = 0,'',CONCAT_WS('-',SUBSTRING(dateCrea_etab,0,4),SUBSTRING(dateCrea_etab,4,2),SUBSTRING(dateCrea_etab,6,2))) AS dateCrea_etab",
'sql' => "IF(dateCrea_etab = 0,'',CONCAT_WS('-',SUBSTRING(dateCrea_etab,0,4),SUBSTRING(dateCrea_etab,4,2),SUBSTRING(dateCrea_etab,6,2))) AS creaetab",
),
'creaent' => array(
'label' => "Date de création de l'entreprise",
'column' => 'dateCrea_ent',
'sql' => "IF(dateCrea_ent=0,'',CONCAT_WS('-',SUBSTRING(dateCrea_ent,0,4),SUBSTRING(dateCrea_ent,4,2),SUBSTRING(dateCrea_ent,6,2))) AS dateCrea_ent",
'sql' => "IF(dateCrea_ent=0,'',CONCAT_WS('-',SUBSTRING(dateCrea_ent,0,4),SUBSTRING(dateCrea_ent,4,2),SUBSTRING(dateCrea_ent,6,2))) AS creaent",
),
'dateimmat' => array(
'label' => "Date d'immatriculation de l'entreprise",
@ -165,7 +165,7 @@ class Enrichissement
'teffetablissement' => array(
'label' => "Code Tranche Effectif Etablissement",
'column' => 'teff_etab',
'sql' => "IF(teff_etab IS NULL,'NN',teff_etab) AS teff_etab",
'sql' => "IF(teff_etab IS NULL,'NN',teff_etab) AS teffetablissement",
'values' => array(
'NN' => "Unités non employeuses", //NN
'0' => "0 salarié",
@ -188,7 +188,7 @@ class Enrichissement
'teffentreprise' => array(
'label' => "Code Tranche Effectif Entreprise",
'column' => 'teff_entrep',
'sql' => "IF(teff_entrep IS NULL,'NN',teff_entrep) AS teff_entrep",
'sql' => "IF(teff_entrep IS NULL,'NN',teff_entrep) AS teffentreprise",
'values' => array(
'NN' => "Unités non employeuses", //NN
'0' => "0 salarié",