Commit 641e04ad authored by Florian Joriot's avatar Florian Joriot
Browse files

Merge branch 'missions' into ModularisationOF_FJ

parents 5b0a4a3d 776e6b8b
Loading
Loading
Loading
Loading
+2 −2
Changes for admin/actions/update-employeur.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ foreach ($listFiles as $file) {
        $nomCommercial = (!empty($data[5])) ? $data[5] : '';
        $nomCommercial .= (!empty($data[6])) ? ' ' . $data[6] : '';
        $nomCommercial .= (!empty($data[7])) ? ' ' . $data[7] : '';
        $nomCommercial = str_replace("'", "''", $nomCommercial);
        $nomCommercial = str_replace("''", "'", $nomCommercial);
        //RAISON_SOCIALE
        $nomJuridique = $data[4];
        //SIREN
@@ -124,7 +124,7 @@ foreach ($listFiles as $file) {
        } elseif (!empty($nomPropre)) {
            $raisonSociale = $nomPropre;
        }
        $raisonSociale = str_replace("'", "''", $raisonSociale);
        $raisonSociale = str_replace("''", "'", $raisonSociale);
        //Si pas de raison sociale et pas de nom commercial on passe
        if (empty($raisonSociale) && empty($nomCommercial)) {
            continue;
+713 −327

File changed.

Preview size limit exceeded, changes collapsed.

+12 −0
Changes for data/ddl/table/TYPE_PIECE_JOINTE_STATUT.php: 12 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -141,6 +141,18 @@ return [
            'position'    => 1,
            'commentaire' => NULL,
        ],
        'NATIONALITE_ETRANGERE' => [
            'name'        => 'NATIONALITE_ETRANGERE',
            'type'        => 'bool',
            'bdd-type'    => 'NUMBER',
            'length'      => 0,
            'scale'       => '0',
            'precision'   => 1,
            'nullable'    => FALSE,
            'default'     => '0',
            'position'    => 19,
            'commentaire' => NULL,
        ],
        'NUM_REGLE'             => [
            'name'        => 'NUM_REGLE',
            'type'        => 'int',
+1 −1
Changes for data/ddl/unique-constraint/EMPLOYEUR_SOURCE_UN.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@
return [
    'name'    => 'EMPLOYEUR_SOURCE_UN',
    'table'   => 'EMPLOYEUR',
    'index'   => 'EMPLOYEUR_SOURCE_UN',
    'index'   => NULL,
    'columns' => [
        'SOURCE_CODE',
        'HISTO_DESTRUCTION',
+10 −1
Changes for data/ddl/view/V_TBL_PIECE_JOINTE_DEMANDE.sql: 10 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -70,7 +70,16 @@ WHERE i.histo_destruction IS NULL
                       THEN 0
                   ELSE 1 END
          END = 1

   -- Demandé uniquement si nationalité étrangère
   AND CASE
  		WHEN tpjs.nationalite_etrangere = 0 OR d.id IS null
			THEN 1
		ELSE CASE
				WHEN
					d.pays_nationalite_id = (SELECT MAX(id) FROM pays p WHERE libelle IN ('France','FRANCE') AND histo_destruction IS NULL GROUP BY id)
				THEN 0
				ELSE 1 END
			END = 1
  -- Filtre FC
  AND (tpjs.fc = 0 OR i_h.fc > 0)
GROUP BY i.annee_id,
Loading