Commit e1afe8dc authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Merge remote-tracking branch 'origin/master'

parents f20ce42a 4184eaf3

admin/src/BddAdmin/Driver/Oracle/TableManager.php

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ class TableManager extends AbstractManager implements TableManagerInterface 
                break;

                case 'VARCHAR2':

                case 'CHAR':

                case 'RAW':

                    $type = Bdd::TYPE_STRING;

                break;

                case 'DATE':

doc/Connecteurs-Import/Octopus/MV_INTERVENANT.sql

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ SELECT DISTINCT 
    grade.c_grade                                                  z_grade_id,

    COALESCE(cnua.code_cnu_arrange, '00')                          z_discipline_id,

    /* Données identifiantes de base */

    CASE ind.sexe

    CASE COALESCE(ind.sexe_ow,ind.sexe)

        WHEN 'M' THEN 'M.'

        ELSE 'Mme'

        END                                                        z_civilite_id,

module/Application/src/Service/ModeleContratService.php

+2 −2
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ class ModeleContratService extends AbstractEntityService 
    public function generer(Contrat $contrat, $download = true)

    {

        $fileName = sprintf(($contrat->estUnAvenant() ? 'avenant' : 'contrat') . "_%s_%s_%s.pdf",

            $contrat->getStructure()->getCode(),

            ($contrat->getStructure() == null ? null : $contrat->getStructure()->getCode()),

            $contrat->getIntervenant()->getNomUsuel(),

            $contrat->getIntervenant()->getCode());
@@ -115,7 +115,7 @@ class ModeleContratService extends AbstractEntityService 
    public function prepareMail(Contrat $contrat, string $htmlContent, string $from, string $to, string $cci = null, string $subject = null)

    {

        $fileName = sprintf(($contrat->estUnAvenant() ? 'avenant' : 'contrat') . "_%s_%s_%s.pdf",

            $contrat->getStructure()->getCode(),

            ($contrat->getStructure() == null ? null : $contrat->getStructure()->getCode()),

            $contrat->getIntervenant()->getNomUsuel(),

            $contrat->getIntervenant()->getCode());