Commit 050c7a1d authored by Jean-Baptiste Oellers's avatar Jean-Baptiste Oellers
Browse files

Merge branch 'connor-dev' into connor

parents 93293386 95ccbd06

doc/codenaf.sql

0 → 100644
+1708 −0

File added.

Preview size limit exceeded, changes collapsed.

docker/dev/postgresql/docker-entrypoint-initdb.d/sql/001-oscar-structure.sql

+2 −1
Original line number Diff line number Diff line
@@ -1017,7 +1017,8 @@ CREATE TABLE public.organization ( 
                                     rnsr character varying(255) DEFAULT NULL::character varying,

                                     duns character varying(255) DEFAULT NULL::character varying,

                                     tvaintra character varying(255) DEFAULT NULL::character varying,

                                     codepic TEXT

                                     codepic TEXT,

                                     codenaf TEXT

);

docker/postgres_initdb.d/sql/01-structure.sql

+2 −1
Original line number Diff line number Diff line
@@ -1126,7 +1126,8 @@ CREATE TABLE public.organization ( 
                                     createdby_id integer,

                                     updatedby_id integer,

                                     deletedby_id integer,

                                     codepic TEXT

                                     codepic TEXT,

                                     codenaf TEXT

);

install/oscar-install.sql

+2 −1
Original line number Diff line number Diff line
@@ -1126,7 +1126,8 @@ CREATE TABLE public.organization ( 
                                     createdby_id integer,

                                     updatedby_id integer,

                                     deletedby_id integer,

                                     codepic TEXT

                                     codepic TEXT,

                                     codenaf TEXT

);

module/Oscar/config/module.config.php

+10 −1
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ return array( 
                        'activityForm', // OK

                        'activityIndexBuild', // OK

                        'activityStatus', // OK

                        'codenaf',

                        'connectorsConfig',

                        'connectorTest',

                        'connectorExecute',
@@ -374,6 +375,12 @@ return array( 
                    'roles' => ['user'],

                ],



                [

                    'controller' => 'Codenaf',

                    'action' => ['api'],

                    'roles' => ['user'],

                ],



                [

                    'controller' => 'ActivityMotsCles',

                    'action' => ['api'],
@@ -466,7 +473,8 @@ return array( 
                        'reindexOne',

                        'search',

                        'suborganization',

                        'create'

                        'create',

                        'api'

                    ],

                    'roles' => ['user']
@@ -698,6 +706,7 @@ return array( 
            'AdministrativeDocument' => \Oscar\Controller\AdministrativeDocumentControllerFactory::class,

            'CheminDecisionnel' => \Oscar\Controller\CheminDecisionnelControllerFactory::class,

            'CheminDecisionnelAdministration' => \Oscar\Controller\CheminDecisionnelAdministrationControllerFactory::class,

            'Codenaf' => \Oscar\Controller\CodenafControllerFactory::class,

            'Connector' => \Oscar\Controller\ConnectorControllerFactory::class,

            'DateType' => \Oscar\Controller\DateTypeControllerFactory::class,

            'Depense' => \Oscar\Controller\DepenseControllerFactory::class,