Exécution de la commande : GIT_SSH_COMMAND='ssh -o StrictHostKeyChecking=no' git clone -b "ES-2576/TKES2703B1---pb-avec-le-planning-mobile-les-sous-traitant-ne-voient-qu'un-prestation-par-jour" git@github.com:Intrapole/EventSoft.git /var/www/html/1579-8.4
Cloning into '/var/www/html/1579-8.4'...
Updating files: 3% (102/2683)
Updating files: 4% (108/2683)
Updating files: 5% (135/2683)
Updating files: 6% (161/2683)
Updating files: 7% (188/2683)
Updating files: 8% (215/2683)
Updating files: 9% (242/2683)
Updating files: 10% (269/2683)
Updating files: 11% (296/2683)
Updating files: 12% (322/2683)
Updating files: 13% (349/2683)
Updating files: 14% (376/2683)
Updating files: 15% (403/2683)
Updating files: 16% (430/2683)
Updating files: 17% (457/2683)
Updating files: 18% (483/2683)
Updating files: 19% (510/2683)
Updating files: 20% (537/2683)
Updating files: 21% (564/2683)
Updating files: 22% (591/2683)
Updating files: 23% (618/2683)
Updating files: 24% (644/2683)
Updating files: 25% (671/2683)
Updating files: 26% (698/2683)
Updating files: 27% (725/2683)
Updating files: 28% (752/2683)
Updating files: 29% (779/2683)
Updating files: 30% (805/2683)
Updating files: 31% (832/2683)
Updating files: 32% (859/2683)
Updating files: 33% (886/2683)
Updating files: 34% (913/2683)
Updating files: 35% (940/2683)
Updating files: 36% (966/2683)
Updating files: 37% (993/2683)
Updating files: 38% (1020/2683)
Updating files: 39% (1047/2683)
Updating files: 40% (1074/2683)
Updating files: 41% (1101/2683)
Updating files: 42% (1127/2683)
Updating files: 43% (1154/2683)
Updating files: 44% (1181/2683)
Updating files: 45% (1208/2683)
Updating files: 46% (1235/2683)
Updating files: 47% (1262/2683)
Updating files: 48% (1288/2683)
Updating files: 49% (1315/2683)
Updating files: 50% (1342/2683)
Updating files: 51% (1369/2683)
Updating files: 52% (1396/2683)
Updating files: 53% (1422/2683)
Updating files: 54% (1449/2683)
Updating files: 55% (1476/2683)
Updating files: 56% (1503/2683)
Updating files: 57% (1530/2683)
Updating files: 58% (1557/2683)
Updating files: 59% (1583/2683)
Updating files: 60% (1610/2683)
Updating files: 61% (1637/2683)
Updating files: 61% (1645/2683)
Updating files: 62% (1664/2683)
Updating files: 63% (1691/2683)
Updating files: 64% (1718/2683)
Updating files: 65% (1744/2683)
Updating files: 66% (1771/2683)
Updating files: 67% (1798/2683)
Updating files: 68% (1825/2683)
Updating files: 69% (1852/2683)
Updating files: 69% (1877/2683)
Updating files: 70% (1879/2683)
Updating files: 71% (1905/2683)
Updating files: 72% (1932/2683)
Updating files: 73% (1959/2683)
Updating files: 74% (1986/2683)
Updating files: 75% (2013/2683)
Updating files: 76% (2040/2683)
Updating files: 77% (2066/2683)
Updating files: 78% (2093/2683)
Updating files: 79% (2120/2683)
Updating files: 80% (2147/2683)
Updating files: 81% (2174/2683)
Updating files: 82% (2201/2683)
Updating files: 83% (2227/2683)
Updating files: 84% (2254/2683)
Updating files: 84% (2274/2683)
Updating files: 85% (2281/2683)
Updating files: 86% (2308/2683)
Updating files: 87% (2335/2683)
Updating files: 88% (2362/2683)
Updating files: 89% (2388/2683)
Updating files: 90% (2415/2683)
Updating files: 91% (2442/2683)
Updating files: 92% (2469/2683)
Updating files: 93% (2496/2683)
Updating files: 94% (2523/2683)
Updating files: 95% (2549/2683)
Updating files: 96% (2576/2683)
Updating files: 97% (2603/2683)
Updating files: 98% (2630/2683)
Updating files: 99% (2657/2683)
Updating files: 100% (2683/2683)
Updating files: 100% (2683/2683), done.
Exécution de la commande : mkdir /var/www/html/1579-8.4/data/img/photos/
Exécution de la commande : mkdir /var/www/html/1579-8.4/data/img/photos/demo
Exécution de la commande : chmod -R 777 /var/www/html/1579-8.4/data/img/
Exécution de la commande : sed -i 's/`intra`/`1579-8.4`/g' /var/www/html/1579-8.4/.devtools/cypress/import/dummydb.sql
Exécution de la commande : mysql -h mysql -uroot -proot -e 'SET autocommit=0 ; source /var/www/html/1579-8.4/.devtools/cypress/import/dummydb.sql; COMMIT;'
mysql: [Warning] Using a password on the command line interface can be insecure.
Exécution de la commande : cp /var/www/html/1579-8.4/settings/settings.inc.cypress.php /var/www/html/1579-8.4/settings/settings.inc.php
Exécution de la commande : sed -i "s/\['dbserver'\] = 'localhost'/\['dbserver'\] = 'mysql'/g" /var/www/html/1579-8.4/settings/settings.inc.php
Exécution de la commande : sed -i "s/\['dbname'\] = 'intra'/\['dbname'\] = '1579-8.4'/g" /var/www/html/1579-8.4/settings/settings.inc.php
Exécution de la commande : sed -i "s/'\/eventsoft\/tmp\/'/'\/tmp\/'/g" /var/www/html/1579-8.4/settings/settings.inc.php
Exécution de la commande : sed -i "s|const ET_WWW = 'http://localhost/';|const ET_WWW = 'https://delivery.d.itrp.fr/1579-8.4/';|g; s|const ET_WWW_INTERNE = 'http://localhost/';|const ET_WWW_INTERNE = 'https://delivery.d.itrp.fr/1579-8.4/';|g" /var/www/html/1579-8.4/settings/settings.inc.php
Exécution de la commande : mkdir /var/www/html/1579-8.4/tmp
Exécution de la commande : chmod -R 777 /var/www/html/1579-8.4/tmp
Exécution de la commande : (cd /var/www/html/1579-8.4/ && php8.4 composer.phar install -o --ignore-platform-reqs --no-dev --no-scripts)
Installing dependencies from lock file
Verifying lock file contents can be installed on current platform.
Package operations: 103 installs, 0 updates, 0 removals
As there is no 'unzip' nor '7z' command installed zip files are being unpacked using the PHP zip extension.
This may cause invalid reports of corrupted archives. Besides, any UNIX permissions (e.g. executable) defined in the archives will be lost.
Installing 'unzip' or '7z' (21.01+) may remediate them.
Cannot create cache directory /var/www/.cache/composer/files/, or directory is not writable. Proceeding without cache. See also cache-read-only config if your filesystem is read-only.
- Downloading dragonmantank/cron-expression (v2.3.1)
- Downloading adamz01h/php-cron-scheduler (dev-master 73b16b1)
- Downloading digitick/sepa-xml (2.2.1)
- Downloading psr/cache (3.0.0)
- Downloading doctrine/lexer (3.0.1)
- Downloading doctrine/annotations (2.0.2)
- Downloading symfony/var-exporter (v7.2.5)
- Downloading symfony/string (v7.2.0)
- Downloading symfony/deprecation-contracts (v3.5.1)
- Downloading psr/container (2.0.2)
- Downloading symfony/service-contracts (v3.5.1)
- Downloading symfony/console (v7.2.5)
- Downloading doctrine/event-manager (2.0.1)
- Downloading doctrine/persistence (4.0.0)
- Downloading doctrine/instantiator (2.0.0)
- Downloading doctrine/inflector (2.0.10)
- Downloading doctrine/deprecations (1.1.5)
- Downloading psr/log (3.0.2)
- Downloading doctrine/dbal (4.2.3)
- Downloading symfony/polyfill-php84 (v1.31.0)
- Downloading doctrine/collections (2.3.0)
- Downloading doctrine/orm (3.3.2)
- Downloading egulias/email-validator (4.0.4)
- Downloading firebase/php-jwt (v6.11.0)
- Downloading ramsey/collection (2.1.1)
- Downloading brick/math (0.12.3)
- Downloading ramsey/uuid (4.7.6)
- Downloading ralouphie/getallheaders (3.0.3)
- Downloading psr/http-message (2.0)
- Downloading psr/http-factory (1.1.0)
- Downloading guzzlehttp/psr7 (2.7.1)
- Downloading guzzlehttp/promises (2.2.0)
- Downloading grpc/grpc (1.57.0)
- Downloading google/protobuf (v4.30.2)
- Downloading google/longrunning (0.4.7)
- Downloading psr/http-client (1.0.3)
- Downloading guzzlehttp/guzzle (7.9.3)
- Downloading google/auth (v1.46.0)
- Downloading google/grpc-gcp (v0.4.1)
- Downloading google/common-protos (4.11.0)
- Downloading google/gax (v1.36.0)
- Downloading rize/uri-template (0.4.0)
- Downloading monolog/monolog (3.9.0)
- Downloading google/cloud-core (v1.62.1)
- Downloading google/cloud-vision (v1.10.3)
- Downloading http-interop/http-factory-guzzle (1.2.0)
- Downloading meng-tian/php-soap-interpreter (2.0.0)
- Downloading meng-tian/soap-http-binding (0.4.1)
- Downloading meng-tian/php-async-soap (1.0.2)
- Downloading meng-tian/async-soap-guzzle (v0.4.1)
- Downloading mikehaertl/php-tmpfile (1.3.0)
- Downloading mikehaertl/php-shellcommand (1.7.0)
- Downloading mikehaertl/phpwkhtmltopdf (2.5.0)
- Downloading misterduval/phpclassesorg-sasl (dev-master 5f3eaeb)
- Downloading misterduval/phpclassesorg-mimeparser (dev-master 0e62272)
- Downloading misterduval/phpclassesorg-pop3class (dev-master ed07396)
- Downloading nategood/httpful (1.0.0)
- Downloading pear/console_getopt (v1.4.3)
- Downloading pear/pear_exception (v1.0.2)
- Downloading pear/pear-core-minimal (v1.10.16)
- Downloading pear/ole (dev-master dd26381)
- Downloading pear/spreadsheet_excel_writer (dev-master 4da1b7b)
- Downloading paragonie/random_compat (v9.99.100)
- Downloading paragonie/constant_time_encoding (v3.0.0)
- Downloading phpseclib/phpseclib (3.0.43)
- Downloading php-amqplib/php-amqplib (v3.7.3)
- Downloading php-http/promise (1.3.1)
- Downloading php-http/httplug (2.4.1)
- Downloading php-http/guzzle7-adapter (1.1.0)
- Downloading php-mime-mail-parser/php-mime-mail-parser (9.0.1)
- Downloading phpstan/phpdoc-parser (2.1.0)
- Downloading phpdocumentor/reflection-common (2.2.0)
- Downloading phpdocumentor/type-resolver (1.10.0)
- Downloading symfony/options-resolver (v7.2.0)
- Downloading jean85/pretty-package-versions (2.1.1)
- Downloading sentry/sentry (4.10.0)
- Downloading setasign/fpdf (1.8.6)
- Downloading setasign/fpdi (v2.6.3)
- Downloading setasign/fpdi_pdf-parser (2.1.4)
- Downloading smsfactor/smsfactor-php-sdk (v1.0.5)
- Downloading symfony/cache-contracts (v3.5.1)
- Downloading symfony/cache (v7.2.5)
- Downloading psr/event-dispatcher (1.0.0)
- Downloading symfony/event-dispatcher-contracts (v3.5.1)
- Downloading symfony/event-dispatcher (v7.2.0)
- Downloading symfony/http-client-contracts (v3.5.2)
- Downloading symfony/http-client (v7.2.4)
- Downloading symfony/mime (v7.2.4)
- Downloading symfony/mailer (v7.2.3)
- Downloading symfony/mailgun-mailer (v7.2.0)
- Downloading tecnickcom/tcpdf (6.9.1)
- Downloading webmozart/assert (1.11.0)
- Downloading phpdocumentor/reflection-docblock (5.6.1)
- Downloading voku/arrayy (7.9.6)
- Downloading teknoo/immutable (3.0.19)
- Downloading teknoo/sellsy-client (3.0.29)
- Downloading twig/twig (v3.20.0)
- Downloading symfony/intl (v7.2.0)
- Downloading twig/intl-extra (v3.20.0)
- Downloading symfony/yaml (v7.2.5)
- Downloading symfony/finder (v7.2.2)
- Downloading nikic/php-parser (v5.4.0)
- Downloading zircote/swagger-php (5.0.7)
0/103 [>---------------------------] 0%
9/103 [==>-------------------------] 8%
18/103 [====>-----------------------] 17%
23/103 [======>---------------------] 22%
39/103 [==========>-----------------] 37%
45/103 [============>---------------] 43%
54/103 [==============>-------------] 52%
64/103 [=================>----------] 62%
79/103 [=====================>------] 76%
86/103 [=======================>----] 83%
94/103 [=========================>--] 91%
101/103 [===========================>] 98%
102/103 [===========================>] 99%
103/103 [============================] 100%
- Installing dragonmantank/cron-expression (v2.3.1): Extracting archive
- Installing adamz01h/php-cron-scheduler (dev-master 73b16b1): Extracting archive
- Installing digitick/sepa-xml (2.2.1): Extracting archive
- Installing psr/cache (3.0.0): Extracting archive
- Installing doctrine/lexer (3.0.1): Extracting archive
- Installing doctrine/annotations (2.0.2): Extracting archive
- Installing symfony/var-exporter (v7.2.5): Extracting archive
- Installing symfony/string (v7.2.0): Extracting archive
- Installing symfony/deprecation-contracts (v3.5.1): Extracting archive
- Installing psr/container (2.0.2): Extracting archive
- Installing symfony/service-contracts (v3.5.1): Extracting archive
- Installing symfony/console (v7.2.5): Extracting archive
- Installing doctrine/event-manager (2.0.1): Extracting archive
- Installing doctrine/persistence (4.0.0): Extracting archive
- Installing doctrine/instantiator (2.0.0): Extracting archive
- Installing doctrine/inflector (2.0.10): Extracting archive
- Installing doctrine/deprecations (1.1.5): Extracting archive
- Installing psr/log (3.0.2): Extracting archive
- Installing doctrine/dbal (4.2.3): Extracting archive
- Installing symfony/polyfill-php84 (v1.31.0): Extracting archive
- Installing doctrine/collections (2.3.0): Extracting archive
- Installing doctrine/orm (3.3.2): Extracting archive
- Installing egulias/email-validator (4.0.4): Extracting archive
- Installing firebase/php-jwt (v6.11.0): Extracting archive
- Installing ramsey/collection (2.1.1): Extracting archive
- Installing brick/math (0.12.3): Extracting archive
- Installing ramsey/uuid (4.7.6): Extracting archive
- Installing ralouphie/getallheaders (3.0.3): Extracting archive
- Installing psr/http-message (2.0): Extracting archive
- Installing psr/http-factory (1.1.0): Extracting archive
- Installing guzzlehttp/psr7 (2.7.1): Extracting archive
- Installing guzzlehttp/promises (2.2.0): Extracting archive
- Installing grpc/grpc (1.57.0): Extracting archive
- Installing google/protobuf (v4.30.2): Extracting archive
- Installing google/longrunning (0.4.7): Extracting archive
- Installing psr/http-client (1.0.3): Extracting archive
- Installing guzzlehttp/guzzle (7.9.3): Extracting archive
- Installing google/auth (v1.46.0): Extracting archive
- Installing google/grpc-gcp (v0.4.1): Extracting archive
- Installing google/common-protos (4.11.0): Extracting archive
- Installing google/gax (v1.36.0): Extracting archive
- Installing rize/uri-template (0.4.0): Extracting archive
- Installing monolog/monolog (3.9.0): Extracting archive
- Installing google/cloud-core (v1.62.1): Extracting archive
- Installing google/cloud-vision (v1.10.3): Extracting archive
- Installing http-interop/http-factory-guzzle (1.2.0): Extracting archive
- Installing meng-tian/php-soap-interpreter (2.0.0): Extracting archive
- Installing meng-tian/soap-http-binding (0.4.1): Extracting archive
- Installing meng-tian/php-async-soap (1.0.2): Extracting archive
- Installing meng-tian/async-soap-guzzle (v0.4.1): Extracting archive
- Installing mikehaertl/php-tmpfile (1.3.0): Extracting archive
- Installing mikehaertl/php-shellcommand (1.7.0): Extracting archive
- Installing mikehaertl/phpwkhtmltopdf (2.5.0): Extracting archive
- Installing misterduval/phpclassesorg-sasl (dev-master 5f3eaeb): Extracting archive
- Installing misterduval/phpclassesorg-mimeparser (dev-master 0e62272): Extracting archive
- Installing misterduval/phpclassesorg-pop3class (dev-master ed07396): Extracting archive
- Installing nategood/httpful (1.0.0): Extracting archive
- Installing pear/console_getopt (v1.4.3): Extracting archive
- Installing pear/pear_exception (v1.0.2): Extracting archive
- Installing pear/pear-core-minimal (v1.10.16): Extracting archive
- Installing pear/ole (dev-master dd26381): Extracting archive
- Installing pear/spreadsheet_excel_writer (dev-master 4da1b7b): Extracting archive
- Installing paragonie/random_compat (v9.99.100): Extracting archive
- Installing paragonie/constant_time_encoding (v3.0.0): Extracting archive
- Installing phpseclib/phpseclib (3.0.43): Extracting archive
- Installing php-amqplib/php-amqplib (v3.7.3): Extracting archive
- Installing php-http/promise (1.3.1): Extracting archive
- Installing php-http/httplug (2.4.1): Extracting archive
- Installing php-http/guzzle7-adapter (1.1.0): Extracting archive
- Installing php-mime-mail-parser/php-mime-mail-parser (9.0.1): Extracting archive
- Installing phpstan/phpdoc-parser (2.1.0): Extracting archive
- Installing phpdocumentor/reflection-common (2.2.0): Extracting archive
- Installing phpdocumentor/type-resolver (1.10.0): Extracting archive
- Installing symfony/options-resolver (v7.2.0): Extracting archive
- Installing jean85/pretty-package-versions (2.1.1): Extracting archive
- Installing sentry/sentry (4.10.0): Extracting archive
- Installing setasign/fpdf (1.8.6): Extracting archive
- Installing setasign/fpdi (v2.6.3): Extracting archive
- Installing setasign/fpdi_pdf-parser (2.1.4): Extracting archive
- Installing smsfactor/smsfactor-php-sdk (v1.0.5): Extracting archive
- Installing symfony/cache-contracts (v3.5.1): Extracting archive
- Installing symfony/cache (v7.2.5): Extracting archive
- Installing psr/event-dispatcher (1.0.0): Extracting archive
- Installing symfony/event-dispatcher-contracts (v3.5.1): Extracting archive
- Installing symfony/event-dispatcher (v7.2.0): Extracting archive
- Installing symfony/http-client-contracts (v3.5.2): Extracting archive
- Installing symfony/http-client (v7.2.4): Extracting archive
- Installing symfony/mime (v7.2.4): Extracting archive
- Installing symfony/mailer (v7.2.3): Extracting archive
- Installing symfony/mailgun-mailer (v7.2.0): Extracting archive
- Installing tecnickcom/tcpdf (6.9.1): Extracting archive
- Installing webmozart/assert (1.11.0): Extracting archive
- Installing phpdocumentor/reflection-docblock (5.6.1): Extracting archive
- Installing voku/arrayy (7.9.6): Extracting archive
- Installing teknoo/immutable (3.0.19): Extracting archive
- Installing teknoo/sellsy-client (3.0.29): Extracting archive
- Installing twig/twig (v3.20.0): Extracting archive
- Installing symfony/intl (v7.2.0): Extracting archive
- Installing twig/intl-extra (v3.20.0): Extracting archive
- Installing symfony/yaml (v7.2.5): Extracting archive
- Installing symfony/finder (v7.2.2): Extracting archive
- Installing nikic/php-parser (v5.4.0): Extracting archive
- Installing zircote/swagger-php (5.0.7): Extracting archive
0/92 [>---------------------------] 0%
10/92 [===>------------------------] 10%
30/92 [=========>------------------] 32%
50/92 [===============>------------] 54%
60/92 [==================>---------] 65%
80/92 [========================>---] 86%
90/92 [===========================>] 97%
92/92 [============================] 100%
Generating optimized autoload files
44 packages you are using are looking for funding.
Use the `composer fund` command to find out more!
Exécution de la commande : (cd /var/www/html/1579-8.4/ && php-cgi8.4 -f admin-es/upgrade/zip_upgrade.php sql)
Demo
Local: 1043 - Distant: 1046
Mise à jour SQL
LOCAL : 909 - DISTANT : 1046
#REVISION 910
ALTER TABLE t_chantier_pour_objet COMMENT = 'Un numéro d\'objet est nécessaire par entité d\'embauche des salariés présents sur la presta';
#REVISION 914
ALTER TABLE `t_salarie`
CHANGE `SAL_CODEPERS` `SAL_CODEPERS` varchar(20) COLLATE 'utf8mb3_unicode_ci' NOT NULL DEFAULT '' AFTER `SAL_DISPO_ACTIVATE`,
CHANGE `SAL_PASS` `SAL_PASS` varchar(60) COLLATE 'utf8mb3_unicode_ci' NOT NULL DEFAULT '' AFTER `SAL_LOGIN`,
CHANGE `SAL_CIVILITE` `SAL_CIVILITE` enum('0','1') COLLATE 'utf8mb3_unicode_ci' NOT NULL DEFAULT '0' AFTER `SAL_STATUS`,
CHANGE `SAL_NOM_NAISSANCE` `SAL_NOM_NAISSANCE` varchar(40) COLLATE 'utf8mb3_unicode_ci' NOT NULL DEFAULT '' AFTER `SAL_STATUT_MARITAL`,
CHANGE `SAL_NOMSCENE` `SAL_NOMSCENE` varchar(40) COLLATE 'utf8mb3_unicode_ci' NOT NULL DEFAULT '' AFTER `SAL_TYPE`,
CHANGE `SAL_ADDR` `SAL_ADDR` varchar(255) COLLATE 'utf8mb3_unicode_ci' NOT NULL AFTER `SAL_NOMSCENE`,
CHANGE `SAL_ADDR_2` `SAL_ADDR_2` varchar(255) COLLATE 'utf8mb3_unicode_520_ci' NOT NULL DEFAULT '' AFTER `SAL_ADDR`,
CHANGE `SAL_CODEPOSTAL` `SAL_CODEPOSTAL` varchar(10) COLLATE 'utf8mb3_unicode_ci' NOT NULL AFTER `SAL_ADDR_3`,
CHANGE `SAL_VILLE` `SAL_VILLE` varchar(40) COLLATE 'utf8mb3_unicode_ci' NOT NULL DEFAULT '' AFTER `SAL_CODEPOSTAL`,
CHANGE `SAL_TEL` `SAL_TEL` varchar(20) COLLATE 'utf8mb3_unicode_ci' NOT NULL AFTER `SAL_PAYS`,
CHANGE `SAL_TELPORT` `SAL_TELPORT` varchar(20) COLLATE 'utf8mb3_unicode_ci' NOT NULL DEFAULT '' AFTER `SAL_TEL`,
CHANGE `SAL_NO_SECU` `SAL_NO_SECU` varchar(21) COLLATE 'utf8mb3_unicode_ci' NOT NULL AFTER `SAL_ATD`,
CHANGE `SAL_PASSEPORT` `SAL_PASSEPORT` varchar(32) COLLATE 'utf8mb3_unicode_ci' NOT NULL AFTER `SAL_RESSORTISSANT`,
CHANGE `SAL_LIEU_DE_NAISSANCE` `SAL_LIEU_DE_NAISSANCE` varchar(40) COLLATE 'utf8mb3_unicode_ci' NOT NULL DEFAULT '' AFTER `SAL_NATIONALITE`,
CHANGE `SAL_DEPT_DE_NAISSANCE` `SAL_DEPT_DE_NAISSANCE` varchar(3) COLLATE 'utf8mb3_unicode_ci' NOT NULL AFTER `SAL_LIEU_DE_NAISSANCE`,
CHANGE `SAL_NO_CONGE_SPEC` `SAL_NO_CONGE_SPEC` varchar(8) COLLATE 'utf8mb3_unicode_ci' NOT NULL AFTER `SAL_PAYS_DE_NAISSANCE`,
CHANGE `SAL_EMAIL` `SAL_EMAIL` varchar(64) COLLATE 'utf8mb3_unicode_ci' NOT NULL DEFAULT '' AFTER `SAL_EMAIL_TEST`,
CHANGE `SAL_OBS` `SAL_OBS` text COLLATE 'utf8mb3_unicode_ci' NOT NULL AFTER `SAL_IS_CDA`,
CHANGE `SAL_POSTIT` `SAL_POSTIT` text COLLATE 'utf8mb3_unicode_ci' NOT NULL AFTER `SAL_OBS`,
CHANGE `SAL_LIEN_PARENTE_DG` `SAL_LIEN_PARENTE_DG` varchar(24) COLLATE 'utf8mb3_unicode_ci' NOT NULL DEFAULT '' AFTER `SAL_POSTIT`,
CHANGE `SAL_REGIME_RETRAITE` `SAL_REGIME_RETRAITE` varchar(24) COLLATE 'utf8mb3_unicode_ci' NOT NULL DEFAULT '' AFTER `SAL_LIEN_PARENTE_DG`,
CHANGE `SAL_STATUT_CADRE` `SAL_STATUT_CADRE` enum('0','1') COLLATE 'utf8mb3_unicode_ci' NOT NULL DEFAULT '0' AFTER `SAL_REGIME_RETRAITE`,
CHANGE `SAL_CODE_QUALIF` `SAL_CODE_QUALIF` enum('R','A','T','O') COLLATE 'utf8mb3_unicode_ci' NOT NULL DEFAULT 'T' AFTER `SAL_ECOURRIER`;
#REVISION 916
# Gestion de la section analytique dans les factures fournisseurs. Par défaut dans ES on affectera la section analytique de la commande
#IGNORE_START NOVELTYDEV
ALTER TABLE `t_factures` ADD `FAC_ANALYTIQUE` VARCHAR(21) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL AFTER `FAC_DATECREAT`;
#IGNORE_END NOVELTYDEV
#REVISION 917
DROP TABLE IF EXISTS `t_licence`;
CREATE TABLE `t_licence` (
`LIC_ID` int unsigned NOT NULL AUTO_INCREMENT,
`SAL_ID` int unsigned NOT NULL,
`SESSKEY` varchar(32) COLLATE utf8mb3_unicode_ci NOT NULL,
`CREATED` datetime NOT NULL,
`EXPIRE` datetime NOT NULL,
`MOBILE` bit(1) NOT NULL DEFAULT b'0',
`BROWSER` varchar(64) COLLATE utf8mb3_unicode_ci NOT NULL,
PRIMARY KEY (`LIC_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
ALTER TABLE `t_licence` ADD INDEX `SAL_ID_SESSKEY` (`SAL_ID`, `SESSKEY`);
ALTER TABLE `t_salarie` DROP `SAL_LICENCE`;
#REVISION 918
#ES-1360/Export-journal-OD-specifique
CREATE TABLE `t_ndf_libelle_tva` (
`NDF_LIBELLE_TVA_ID` INT UNSIGNED NOT NULL AUTO_INCREMENT,
`NDF_LIBELLE_TVA_NAME` VARCHAR(255) NOT NULL,
`NDF_LIBELLE_TVA_CODE_COMPTA` VARCHAR(100) NULL,
`NDF_LIBELLE_TVA_ACTIVE` TINYINT NOT NULL DEFAULT 1,
PRIMARY KEY (`NDF_LIBELLE_TVA_ID`)
) ENGINE = InnoDB;
CREATE TABLE `t_ndf_libelle_tva_pour_ndf_type` (
`NDF_TYPE_ID` INT UNSIGNED NOT NULL ,
`NDF_LIBELLE_TVA_ID` INT UNSIGNED NOT NULL
) ENGINE = InnoDB;
CREATE TABLE `t_ndf_libelle_tva_pour_ndf_detail` (
`NDFD_ID` INT NOT NULL,
`NDF_LIBELLE_TVA_ID` INT NOT NULL,
`NDF_MONTANT_TVA` FLOAT(8,2) NOT NULL,
`NDF_MONTANT_TVA_ACC` FLOAT(8,2) NOT NULL
) ENGINE = InnoDB;
#On remplace le champ historique de TVA dans t_ndf par un libelle par défaut pour tout le monde
INSERT INTO t_ndf_libelle_tva
SET NDF_LIBELLE_TVA_ID = 1,
NDF_LIBELLE_TVA_NAME = 'TVA',
NDF_LIBELLE_TVA_CODE_COMPTA = 'TVA',
NDF_LIBELLE_TVA_ACTIVE = 1;
# On insére pour tous les types de note de frais le ndf_libelle_par defaut
INSERT INTO t_ndf_libelle_tva_pour_ndf_type (NDF_TYPE_ID, NDF_LIBELLE_TVA_ID)
SELECT NDF_TYPE_ID, 1
FROM t_ndf_type
WHERE NDF_TYPE_ID != 8;
# On insére pour toutes les anciennes notes de frais existantes en DB la valeur de TVA dans t_ndf_libelle_tva_pour_ndf_detail
INSERT INTO t_ndf_libelle_tva_pour_ndf_detail (NDFD_ID, NDF_LIBELLE_TVA_ID, NDF_MONTANT_TVA, NDF_MONTANT_TVA_ACC)
SELECT NDFD_ID, 1, NDFD_MONTANT_TVA, NDFD_MONTANT_TVA_ACC FROM t_ndf_detail;
#ES-1360/Export-journal-OD-specifique
#ES-1517 Superviseurs/chefs de chantier - Accès temporaire #18163
INSERT IGNORE INTO `t_droit` (`DR_ID`, `CAT_ID`, `DR_NOM`, `DR_DESC`, `DR_DESC_EN`, `DR_ACTIVATED`, `DR_IS_CONSULT`) VALUES (NULL, '1', 'login_hors_cale', 'Connexion à EventSoft en dehors des périodes calées', 'Connection to EventSoft outside of scheduled periods', '1', '1');
INSERT IGNORE INTO t_pour_droit (DR_ID, FONC_ID) SELECT (SELECT DR_ID FROM t_droit WHERE DR_NOM = 'login_hors_cale'), FONC_ID FROM t_pour_droit WHERE DR_ID = (SELECT DR_ID FROM t_droit WHERE DR_NOM = 'login');
#ES-1517 Superviseurs/chefs de chantier - Accès temporaire #18163
#IGNORE_START LENOTRETEST
ALTER TABLE `t_salarie` ADD `SAL_FONC_ID_SAP` INT(11) UNSIGNED NOT NULL COMMENT 'Spé Lenotre - Qualification du salarié à exporter dans SAP' AFTER `SAL_FONCPRINC_ID`;
#IGNORE_END LENOTRETEST
ALTER TABLE t_salarie_status ADD SS_MINIMUM_CONV_BLOQ ENUM('0','1') CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '0' AFTER SS_INITMAJ;
ALTER TABLE `t_salarie` ADD `SAL_CARTE_PRO_SGE` enum('0','1') COLLATE 'utf8mb3_unicode_ci' NOT NULL DEFAULT '0' COMMENT 'Surveillance Grands Évènements' AFTER `SAL_CARTE_PRO`;
ALTER TABLE `t_course_type` ADD `CRS_TYPE_EXC_FINANCE` enum('0','1') COLLATE 'utf8mb3_unicode_ci' NOT NULL DEFAULT '0' COMMENT '1: Exclusion de la gestion financière';
#REVISION 923
ALTER TABLE `t_monnaie`
CHANGE `FORMAT` `FORMAT` tinyint unsigned NOT NULL DEFAULT '0' COMMENT '1: X 0,000.00, 2: 0 000,00 X, 3: X 0.000,00, 4: 0,000.00 X, 5: X 0\'000.00' AFTER `BLANK`;
INSERT INTO `t_monnaie` SET `NAME` = 'Dirham Marocain', `ISO_CODE` = 'MAD', `SIGN` = 'Dh', `BLANK` = '1', `FORMAT` = '2', `CONVERSION_RATE` = '10.72132';
#REVISION 932
ALTER TABLE `t_fonction`
CHANGE `FONC_PRINCIPALE` `FONC_PRINCIPALE` enum('0','1') COLLATE 'utf8mb3_unicode_ci' NOT NULL DEFAULT '0' AFTER `FONC_ACTIVE`,
CHANGE `FONC_REF` `FONC_REF` varchar(64) COLLATE 'utf8mb3_unicode_ci' NOT NULL AFTER `FONC_OFFICIELLE_HERITE`,
CHANGE `FONC_NOM` `FONC_NOM` varchar(64) COLLATE 'utf8mb3_unicode_ci' NULL AFTER `FONC_STATUT`;
#REVISION 934
# Passage de FLOAT vers DOUBLE pour pouvoir stocker une fourchette de montants plus large
ALTER TABLE `t_factures`
CHANGE `FAC_TOTAL_HT` `FAC_TOTAL_HT` DOUBLE(11,2) NOT NULL DEFAULT '0.00',
CHANGE `FAC_TVA` `FAC_TVA` DOUBLE(11,2) NOT NULL DEFAULT '0.00',
CHANGE `FAC_TOTAL_TTC` `FAC_TOTAL_TTC` DOUBLE(11,2) NOT NULL DEFAULT '0.00';
# Ajout colonne dans organisme PPSPS pour identifier le créateur
ALTER TABLE `t_ppsps_organisme` ADD ORGA_PPSPS_CREATEUR_ID INT NULL DEFAULT NULL AFTER PPSPS_ORGANISME_CATEGORY_ID;
# Droit non trouvé chez Aquila. Je l'ajoute même si ce droit n'est pas utilisé
INSERT IGNORE INTO `t_droit` (`CAT_ID`, `DR_NOM`, `DR_DESC`, `DR_ACTIVATED`, `DR_IS_CONSULT`)
VALUES ('2', 'affaires_gestionfi', 'Affichage de la gestion financière dans la prestation', '0', '0');
# ES-1343-Créer-un-document-de-contrôle
INSERT INTO `t_droit` (`DR_ID`, `CAT_ID`, `DR_NOM`, `DR_DESC`, `DR_DESC_EN`, `DR_ACTIVATED`, `DR_IS_CONSULT`) VALUES (NULL, '2', 'affaires_feuille_controle_emargement_fdm', 'Affichage et impression de la Feuille de contrôle émargements (FDM)', 'Viewing and printing the Margins control sheet (FDM)', '0', '0');
# Requêtes pour le nouveau mail chez PARCASTERIX
ALTER TABLE t_regroupe_personnel
ADD IS_POSTULANT enum('0','1') COLLATE 'utf8_unicode_ci' NULL COMMENT 'Pour déterminer si le salarié a été calé en postulant à une offre d\'emploi sur mobile';
INSERT INTO `t_model_text_default` (`MODEL_IDX`, `MODEL_ENT_ID`, `MODEL_CRS_TYPE_ID`, `MODEL_LABEL`, `MODEL_CATEGORY`, `MODEL_TYPE`, `MODEL_TEXT`, `MODEL_OBJECT`, `MODEL_SMS`, `MODEL_LOCK`) VALUES
(622, 0, 0, 'Message postulation acceptée', 'MSG_POSTUL', 'message_postul_ok', 'Bonjour,
Votre postulation pour la prestation @CHANTIER_NOM a été acceptée :
@PHASES_DATES_HEURE_TYPE_LIMITE_QUALIF', 'Votre postulation a été acceptée', '', '0');
#REVISION 936
UPDATE t_model_text_default
SET MODEL_TEXT = 'Bonjour,
Veuillez trouver ci-joint la signature du bon de livraison n°@BL_NUM.
Voici un récapitulatif des informations le concernant :
- Projet : @PROJET_NOM
- Prestation : @CHANTIER_NUMERO - @CHANTIER_NOM
- Client : @CHANTIER_CLIENT
- Lieu : @CHANTIER_LIEU_NOM
Cordialement,
@EMPLOYEUR_RAISON_SOCIALE
Merci de ne pas répondre à ce message.
Pour nous contacter, envoyer un email à l\'adresse @EMPLOYEUR_EMAILS_BL_BR',MODEL_OBJECT = 'Bon de livraison @EMPLOYEUR_RAISON_SOCIALE - @BL_NUM'
WHERE MODEL_CATEGORY = 'MSG_LIVR_REPR'
AND MODEL_TYPE = 'send_livr';
UPDATE t_model_text_default
SET MODEL_TEXT = 'Bonjour,
Veuillez trouver ci-joint la signature du bon de reprise n°@BL_NUM.
Voici un récapitulatif des informations le concernant :
- Projet : @PROJET_NOM
- Prestation : @CHANTIER_NUMERO - @CHANTIER_NOM
- Client : @CHANTIER_CLIENT
- Lieu : @CHANTIER_LIEU_NOM
Cordialement,
@EMPLOYEUR_RAISON_SOCIALE
Merci de ne pas répondre à ce message.
Pour nous contacter, envoyer un email à l\'adresse @EMPLOYEUR_EMAILS_BL_BR',MODEL_OBJECT = 'Bon de reprise @EMPLOYEUR_RAISON_SOCIALE - @BL_NUM'
WHERE MODEL_CATEGORY = 'MSG_LIVR_REPR'
AND MODEL_TYPE = 'send_repr';
#REVISION 938
ALTER TABLE `t_remuneration` ADD `CACH_PREVALIDE_COMPTA_AMP` TINYINT(1) NOT NULL DEFAULT '0' AFTER `CACH_VALIDE_COMPTA_SAP`;
# ES-1711/Suivi-des-transports
ALTER TABLE `t_course` ADD `CRS_RELIVRAISON_ID` int unsigned NULL COMMENT 'Voir Course::get_types_relivraison';
#ES1730 HUMBLOT Ajout du temps de trajet dans les horaires réalisées
ALTER TABLE `t_regroupe_personnel_realise` ADD `HOR_TPS_TRAJET` TIME NULL DEFAULT NULL;
# ES1753
ALTER TABLE `t_salarie` ADD `SAL_CODE_COMPTABLE` VARCHAR(30) COLLATE 'utf8_unicode_ci' NULL AFTER `SAL_CODEPERS2`;
# ES1793
ALTER TABLE `t_chantier` ADD `CHANT_ARTISTIQUE` tinyint NOT NULL DEFAULT '0' AFTER `CHANT_PROVINCE`;
#REVISION 939
#ES173 Ajout de la visibilité feuille de route sur les champs perso prestation.
ALTER TABLE `t_chantier_champ` ADD `CHC_VISIBLE_FROUTE` TINYINT(1) NOT NULL DEFAULT 0;
#REVISION 941
# Passage des champs en UNSIGNED
ALTER TABLE `t_contact`
CHANGE `AB_ID` `AB_ID` INT(11) UNSIGNED NOT NULL DEFAULT '0',
CHANGE `CONTACT_ID` `CONTACT_ID` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
CHANGE `CONTACT_IDX` `CONTACT_IDX` INT(11) UNSIGNED NOT NULL;
# FFCB99 et FF8D20 sont les couleurs par défaut pour les dates non importantes et importantes (utilisées par GL)
CREATE TABLE t_tournee_type (
TOUR_TYPE_ID int(11) UNSIGNED NOT NULL,
TOUR_TYPE_IDX int(11) UNSIGNED NOT NULL,
TOUR_TYPE_INTITULE varchar(64) COLLATE utf8_unicode_ci NOT NULL,
TOUR_TYPE_COLOR varchar(6) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'FFCB99',
TOUR_TYPE_COLOR_MANDATORY_DATE varchar(6) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT 'FF8D20' COMMENT 'Code couleur à appliquer pour la date importante d\'une tournée'
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
ALTER TABLE t_tournee_type ADD PRIMARY KEY (TOUR_TYPE_ID), ADD UNIQUE KEY TOUR_TYPE_INTITULE (TOUR_TYPE_INTITULE);
ALTER TABLE t_tournee_type MODIFY TOUR_TYPE_ID int(11) UNSIGNED NOT NULL AUTO_INCREMENT;
# Désactivé par défaut
INSERT INTO t_droit (CAT_ID, DR_NOM, DR_DESC, DR_DESC_EN, DR_ACTIVATED, DR_IS_CONSULT) VALUES ('1', 'gestion_tournee_types', 'Gestion des types de tournée', 'Tour types management', '0', '0');
ALTER TABLE t_tournee ADD TOUR_TYPE_ID INT(11) UNSIGNED NOT NULL AFTER TOUR_ENTREPRISE_ID;
# ES-1773
ALTER TABLE `t_due` ADD `DUE_CONTRAT_ENVOYE_DATE` datetime DEFAULT NULL AFTER `DUE_CONTRAT_ENVOYE`;
# ES-1875 le numéro CNAPS est censé être d'une longueur de 22 caractères
ALTER TABLE `t_info_societe` ADD `N_CNAPS` varchar(30) NOT NULL DEFAULT '' AFTER `N_AGREMENT`;
# CC_IDX choisi en fonction du dev recent de baptiste sur ES-1788
INSERT INTO `t_contrat_champ` (`CC_IDX`, `CC_NAME`, `CC_LABEL`, `CC_TOOLTIP`, `CC_TOOLTIP_IMAGE`, `CC_TYPE`) VALUES ('558', '@EMPLOYEUR_NUM_CNAPS', 'Numéro d''agrément CNAPS', 'max. 22 caractères', NULL, 'STD');
#ES-192
ALTER TABLE `t_chantier` CHANGE `CHANT_ADDR_LIVR` `CHANT_ADDR_LIVR` TEXT CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '';
#ES-1832
ALTER TABLE t_ndf_libelle_tva_pour_ndf_detail ADD PRIMARY KEY (NDFD_ID, NDF_LIBELLE_TVA_ID);
#ES-1044
ALTER TABLE `t_disponibilite_demande` ADD `DD_PLG_ID` int unsigned NOT NULL DEFAULT '0' COMMENT 'Id de la phase pour un affichage limité à celle-ci';
#ES-1849
ALTER TABLE t_indisponibilite_type MODIFY COLUMN INDISPOT_REF VARCHAR(74);
#REVISION 943
#Oubli de création de de droit dans ES-1398, je le fait maintenant du coup
#On crée le droit si son nom n'existe pas déjà
INSERT IGNORE INTO `t_droit` (`CAT_ID`, `DR_NOM`, `DR_DESC`, `DR_DESC_EN`, `DR_ACTIVATED`, `DR_IS_CONSULT`)
VALUES('9', 'message_tournee_mass', 'Envoi de plusieurs messages séparés pour les chauffeurs depuis une tournée', 'Sending messages to drivers from a tour', 2, 1);
#On ajoute le nouveau droit à tous les profils de droits ayant déjà le droit 'message_tournee'
INSERT INTO t_pour_droit(DR_ID, FONC_ID)
SELECT (SELECT DR_ID FROM t_droit WHERE DR_NOM = 'message_tournee_mass' LIMIT 1), pd.FONC_ID
FROM t_pour_droit pd
INNER JOIN t_droit d ON (pd.DR_ID = d.DR_ID)
WHERE d.DR_NOM = 'message_tournee';
#REVISION 945
INSERT INTO `t_contrat_champ` (`CC_IDX`, `CC_NAME`, `CC_LABEL`, `CC_TOOLTIP`, `CC_TOOLTIP_IMAGE`, `CC_TYPE`)
VALUES ('556', '@PREPA_FORFAIT_MONTANT', 'Montant total des salaires des phases de préparation', NULL, NULL, 'STD');
INSERT INTO `t_contrat_champ` (`CC_IDX`, `CC_NAME`, `CC_LABEL`, `CC_TOOLTIP`, `CC_TOOLTIP_IMAGE`, `CC_TYPE`)
VALUES ('557', '@PREPA_FORFAIT_DUREE', 'Montant total des durées des phases de préparation', NULL, NULL, 'STD');
#REVISION 949
# ES-1477-Phases-type-OFF-Repos
ALTER TABLE `t_phase_type`
ADD `PHASE_SALAIRE` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1' COMMENT 'Est-ce qu\'on calcule les salaires sur ce type de phase ?' AFTER `PHASE_CONTRAT`,
ADD `PHASE_TPS_TRAVAIL` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1' COMMENT 'Est-ce qu\'on calcule le temps de travail sur ce type de phase pour les alertes et les compteurs ?' AFTER `PHASE_SALAIRE`;
# ES-1962
UPDATE `t_droit` SET `DR_DESC` = 'Affichage / Ajout / Modification des documents pour les notes de frais' WHERE `t_droit`.`DR_NOM` = 'cachets_ndf_documents';
#REVISION 954
ALTER TABLE t_salarie CHANGE SAL_VALID SAL_VALID TINYINT(1) NOT NULL DEFAULT '0' COMMENT 'Un sous traitant en plus d\'être actif doit être validé : 0 => Non actif, 1 => Actif, 2 => Suspendu, 3 => Exclu';
# On met à jour le modèle de texte pour indiquer qu'on remonte des documents refusés
UPDATE t_model_text_default
SET MODEL_TEXT = 'Bonjour,
À ce jour, nous vous informons que les documents suivants sont manquants ou refusés ou expirés :
@SOUS_TRAITANT_EXPIRE_DOCS_LIST
Afin de mettre à jour votre dossier, veuillez vous connecter à votre compte en cliquant sur le bouton ci-dessous :
@INTRANET_LINK
Cordialement.
'
WHERE MODEL_CATEGORY = 'ALERT_SST'
AND MODEL_TYPE = 'sst_renouv';
#REVISION 959
#IGNORE_START MTCA
ALTER TABLE `t_phase_type` ADD INDEX(`PHASE_TPS_TRAVAIL`);
#IGNORE_END MTCA
#REVISION 960
-- ES-1865 - Modification de droit pour les documents.
UPDATE t_droit set DR_NOM = 'affaires_documents_mod_tous' WHERE DR_NOM = 'affaires_documents_mod';
INSERT IGNORE INTO `t_droit` (`CAT_ID`, `DR_NOM`, `DR_DESC`, `DR_DESC_EN`, `DR_ACTIVATED`, `DR_IS_CONSULT`)
VALUES ('2', 'affaires_documents_mod', 'L\'utilisateur peut modifier / supprimer les documents qu\'il a importé', 'User can modify / delete his own files', '1', '1');
INSERT IGNORE INTO `t_pour_droit` (`DR_ID`, `FONC_ID`) SELECT DR_ID, 1 FROM t_droit WHERE DR_NOM = 'affaires_documents_mod';
INSERT IGNORE INTO t_pour_droit (DR_ID, FONC_ID) SELECT (SELECT DR_ID FROM t_droit WHERE DR_NOM = 'affaires_documents_mod'), FONC_ID FROM t_pour_droit WHERE DR_ID = (SELECT DR_ID FROM t_droit WHERE DR_NOM = 'affaires_documents_mod_tous');
-- ES-2023-GL-EVENTS-TKES0611B1-Modification-import-BL
ALTER TABLE `t_bdl_livraison` ADD `BL_ACTIVE` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1' AFTER `BL_ID`;
-- Gestion du suivi des conventions SST - A activer chez GL lors de la livraison du développement
INSERT IGNORE INTO t_droit (CAT_ID, DR_NOM, DR_DESC, DR_DESC_EN, DR_ACTIVATED, DR_IS_CONSULT)
VALUES ('26', 'gestion_conventions_sst', 'Gestion des conventions de sous-traitance', 'Management of subcontracting agreement', '0', '0'),
('26', 'gestion_sstraitants_convention', 'Gestion des conventions d\'un sous-traitant', 'Agreement\'s management of a subcontractor', '0', '0'),
('26', 'gestion_sstraitants_edit_convention', 'Ajout / Modification d\'une convention à un sous-traitant', 'Edition of an agreement to a subcontractor', '0', '0'),
('26', 'gestion_sstraitants_deactivate_convention', 'Désactiver / Réactiver une convention d\'un sous-traitant', 'Disable / Re-enable a subcontractor agreement', '0', '0');
CREATE TABLE IF NOT EXISTS t_convention_sstraitants (
CONV_ID int(11) UNSIGNED NOT NULL,
CONV_IDX int(11) UNSIGNED NOT NULL,
CONV_INTITULE varchar(64) COLLATE utf8_unicode_ci NOT NULL,
CONV_COMMENTAIRE text COLLATE utf8_unicode_ci NOT NULL,
CONV_ACTIVE tinyint(1) NOT NULL DEFAULT '1'
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
ALTER TABLE t_convention_sstraitants ADD PRIMARY KEY (CONV_ID);
ALTER TABLE t_convention_sstraitants MODIFY CONV_ID int(11) UNSIGNED NOT NULL AUTO_INCREMENT;
CREATE TABLE IF NOT EXISTS t_convention_sstraitants_pour_entreprise (
CONV_ID int(11) UNSIGNED NOT NULL,
ENTREPRISE_ID int(11) UNSIGNED NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
ALTER TABLE t_convention_sstraitants_pour_entreprise ADD PRIMARY KEY (CONV_ID, ENTREPRISE_ID);
ALTER TABLE t_info_societe ADD CONV_ID int(11) UNSIGNED NOT NULL COMMENT 'Convention de sous-traitance par défaut';
ALTER TABLE t_fichier_type_sstraitants ADD FILE_IS_CONVENTION TINYINT(1) UNSIGNED NOT NULL COMMENT 'Est-ce qu\'on est sur une convention de sous-traitance ?' AFTER FILE_IS_PIECEID_SST;
-- ES-1607 - Modification de droit pour fiche employé sous traitants
INSERT IGNORE INTO `t_droit` (`CAT_ID`, `DR_NOM`, `DR_DESC`, `DR_DESC_EN`, `DR_ACTIVATED`, `DR_IS_CONSULT`)
VALUES ('26', 'personnel_detail_modif_sst', 'Modification d\'une fiche employé en tant que sous-traitants', '', '0', '1');
INSERT IGNORE INTO `t_pour_droit` (DR_ID, FONC_ID)
SELECT (SELECT DR_ID FROM t_droit WHERE DR_NOM = 'personnel_detail_modif_sst'), FONC_ID
FROM t_pour_droit
WHERE DR_ID = (SELECT DR_ID FROM t_droit WHERE DR_NOM = 'personnel_detail_modif');
#REVISION 967
-- ES-2134-Fix-attribution-droit-de-modification-d-une-fiche-employe-sous-traitant
DELETE pdr, d FROM t_pour_droit pdr INNER JOIN t_droit d ON (d.DR_ID = pdr.DR_ID) WHERE d.DR_NOM = 'personnel_detail_modif_sst';
-- ajustement des modules
UPDATE t_droit SET DR_ACTIVATED = '0' WHERE DR_NOM = 'salles_gestion';
UPDATE t_droit SET DR_ACTIVATED = '0' WHERE DR_NOM = 'devis_facture';
UPDATE t_droit SET DR_ACTIVATED = '0' WHERE DR_NOM = 'cachets_export_poleemploi';
#REVISION 972
# ES-1856/limiter-les-types-de-notes-de-frais-par-statuts
CREATE TABLE IF NOT EXISTS `t_salarie_statut_pour_type_ndf` (
`SS_ID` int(11) UNSIGNED NOT NULL,
`NDF_TYPE_ID` int(11) UNSIGNED NOT NULL,
KEY `SS_ID` (`SS_ID`,`NDF_TYPE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Contient les ids des types de ndf et les statuts salariaux';
INSERT IGNORE INTO t_salarie_statut_pour_type_ndf (SS_ID,NDF_TYPE_ID)
SELECT ss.SS_ID, nt.NDF_TYPE_ID
FROM t_salarie_status ss
CROSS JOIN t_ndf_type nt;
# ES-1474 - [GROUPE F] - Gestion BDC
ALTER TABLE t_salarie_status
ADD SS_DO_BDC TINYINT(1) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'Spé sous-traitant SS_ID 100 : Est-ce qu''on gère la création d''un bon de commande ?' AFTER SS_DO_SALAIRE_EXPORT;
CREATE TABLE t_fonction_pour_societe_sstraitants (
FONC_ID int(11) UNSIGNED NOT NULL,
ENTREPRISE_ID int(11) UNSIGNED NOT NULL,
SST_ID int(11) UNSIGNED NOT NULL,
FONC_REF_COMPTA varchar(16) COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Code emploi',
FONC_REF_COMPTA_2 varchar(16) COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Code activité',
FONC_CACHET_ET_DEMI float(6,2) UNSIGNED NOT NULL,
FONC_CACHET float(6,2) UNSIGNED NOT NULL,
FONC_1_2_CACHET float(6,2) UNSIGNED NOT NULL,
FONC_TARIF_JOUR float(6,2) UNSIGNED NOT NULL,
FONC_TARIF_NUIT float(6,2) UNSIGNED NOT NULL,
FONC_TARIF_FERIE_JOUR float(6,2) UNSIGNED NOT NULL,
FONC_TARIF_FERIE_NUIT float(6,2) UNSIGNED NOT NULL,
FONC_TARIF_DIM_JOUR float(6,2) UNSIGNED NOT NULL,
FONC_TARIF_DIM_NUIT float(6,2) UNSIGNED NOT NULL,
FONC_TARIF_FERIE_DIM_JOUR float(6,2) UNSIGNED NOT NULL,
FONC_TARIF_FERIE_DIM_NUIT float(6,2) UNSIGNED NOT NULL,
FONC_PREPA float(6,2) UNSIGNED NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Tarification par qualif et par entreprise des sous-traitants';
ALTER TABLE t_fonction_pour_societe_sstraitants
ADD PRIMARY KEY (FONC_ID, ENTREPRISE_ID, SST_ID);
CREATE TABLE t_fonction_pour_codif_sstraitants (
FONC_ID int(11) UNSIGNED NOT NULL,
CODIF_ID int(11) UNSIGNED NOT NULL COMMENT 'ID de la tarification',
ENTREPRISE_ID int(11) UNSIGNED NOT NULL,
SST_ID int(11) UNSIGNED NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
ALTER TABLE t_fonction_pour_codif_sstraitants
ADD PRIMARY KEY (FONC_ID, CODIF_ID, ENTREPRISE_ID, SST_ID);
ALTER TABLE t_recoit_remu
ADD UNIQUE_ID VARCHAR(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL AFTER RR_DATE_FIN;
INSERT IGNORE INTO t_droit (CAT_ID, DR_NOM, DR_DESC, DR_DESC_EN, DR_ACTIVATED, DR_IS_CONSULT)
VALUES ('2', 'affaire_tarifs_sst', 'Gestion des tarifs des sous-traitants sur une prestation', 'Management of subcontractors'' rates on a project', '0', '0');
INSERT INTO t_model_text_default (MODEL_IDX, MODEL_ENT_ID, MODEL_CRS_TYPE_ID, MODEL_LABEL, MODEL_CATEGORY, MODEL_TYPE, MODEL_TEXT, MODEL_OBJECT, MODEL_SMS, MODEL_LOCK)
VALUES (624, 0, 0, 'Envoi par mail du bon de commande', 'MSG_SST', 'message_bdc', 'Bonjour,
Veuillez trouver ci-joint notre bon de commande pour la prestation @CHANTIER_NOM pour votre société @SOUS_TRAITANT_NOM.
Si besoin d''un complément d''information, vous pouvez joindre @CHANTIER_CHARGE_AFFAIRE_PRENOM @CHANTIER_CHARGE_AFFAIRE_NOM au @CHANTIER_CHARGE_AFFAIRE_TEL_MOBILE.
Bien cordialement,
@EMPLOYEUR_RAISON_SOCIALE', 'Notre bon de commande pour la prestation @CHANTIER_NOM', '', '0');
CREATE TABLE t_bdc (
BDC_ID int(11) UNSIGNED NOT NULL,
BDC_SST_ID int(11) UNSIGNED NOT NULL,
BDC_CHANT_ID int(11) UNSIGNED NOT NULL,
BDC_DATE date NOT NULL,
BDC_TOTAL_HT float(10,2) UNSIGNED NOT NULL,
BDC_IS_SENDMAIL tinyint(1) UNSIGNED NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
ALTER TABLE t_bdc
ADD PRIMARY KEY (BDC_ID),
ADD KEY BDC_SST_ID (BDC_SST_ID),
ADD KEY BDC_CHANT_ID (BDC_CHANT_ID);
ALTER TABLE t_bdc
MODIFY BDC_ID int(11) UNSIGNED NOT NULL AUTO_INCREMENT;
CREATE TABLE t_bdc_ligne (
BDCL_ID int(11) UNSIGNED NOT NULL,
BDC_ID int(11) UNSIGNED NOT NULL,
BDCL_PHASE_NOM varchar(40) COLLATE utf8mb4_general_ci NOT NULL,
BDCL_DATE_DEBUT datetime NOT NULL,
BDCL_DATE_FIN datetime NOT NULL,
BDCL_CACH_ID int(11) UNSIGNED NOT NULL,
BDCL_QTE float(8,2) NOT NULL,
BDCL_TOTAL_HT float(10,2) NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
ALTER TABLE t_bdc_ligne
ADD PRIMARY KEY (BDCL_ID),
ADD KEY BDCL_CACH_ID (BDCL_CACH_ID);
ALTER TABLE t_bdc_ligne
MODIFY BDCL_ID int(11) UNSIGNED NOT NULL AUTO_INCREMENT;
INSERT IGNORE INTO `t_droit_categorie` SET CAT_ID = 2, CAT_NOM = 'GESTION DES PRESTATIONS', CAT_ACTIVATED = '0';
INSERT IGNORE INTO `t_droit_categorie` SET CAT_ID = 3, CAT_NOM = 'PLANNING', CAT_ACTIVATED = '0';
INSERT IGNORE INTO `t_droit_categorie` SET CAT_ID = 4, CAT_NOM = 'GESTION DU PERSONNEL', CAT_ACTIVATED = '0';
INSERT IGNORE INTO `t_droit_categorie` SET CAT_ID = 5, CAT_NOM = 'GESTION DES SALAIRES', CAT_ACTIVATED = '0';
INSERT IGNORE INTO `t_droit_categorie` SET CAT_ID = 6, CAT_NOM = 'GESTION DES VEHICULES', CAT_ACTIVATED = '0';
INSERT IGNORE INTO `t_droit_categorie` SET CAT_ID = 7, CAT_NOM = 'GESTION DES ARTICLES', CAT_ACTIVATED = '0';
INSERT IGNORE INTO `t_droit_categorie` SET CAT_ID = 8, CAT_NOM = 'GESTION DES CONTRATS / DUE', CAT_ACTIVATED = '0';
INSERT IGNORE INTO `t_droit_categorie` SET CAT_ID = 9, CAT_NOM = 'GESTION DES COURSES', CAT_ACTIVATED = '0';
INSERT IGNORE INTO `t_droit_categorie` SET CAT_ID = 10, CAT_NOM = 'GESTION DES SALLES', CAT_ACTIVATED = '0';
INSERT IGNORE INTO `t_droit_categorie` SET CAT_ID = 11, CAT_NOM = 'PLANNING COMMERCIAUX', CAT_ACTIVATED = '0';
INSERT IGNORE INTO `t_droit_categorie` SET CAT_ID = 12, CAT_NOM = 'GESTION DES AEM', CAT_ACTIVATED = '0';
INSERT IGNORE INTO `t_droit_categorie` SET CAT_ID = 13, CAT_NOM = 'GESTION DES CS', CAT_ACTIVATED = '0';
INSERT IGNORE INTO `t_droit_categorie` SET CAT_ID = 14, CAT_NOM = 'GESTION FINANCIERE', CAT_ACTIVATED = '0';
INSERT IGNORE INTO `t_droit_categorie` SET CAT_ID = 15, CAT_NOM = 'EVENTSOFT MOBILE', CAT_ACTIVATED = '0';
INSERT IGNORE INTO `t_droit_categorie` SET CAT_ID = 16, CAT_NOM = 'EVENTSOFT PREPA', CAT_ACTIVATED = '0';
INSERT IGNORE INTO `t_droit_categorie` SET CAT_ID = 17, CAT_NOM = 'ACHATS', CAT_ACTIVATED = '0';
INSERT IGNORE INTO `t_droit_categorie` SET CAT_ID = 18, CAT_NOM = 'GESTION DES SAV', CAT_ACTIVATED = '0';
INSERT IGNORE INTO `t_droit_categorie` SET CAT_ID = 19, CAT_NOM = 'INTRANET', CAT_ACTIVATED = '0';
INSERT IGNORE INTO `t_droit_categorie` SET CAT_ID = 20, CAT_NOM = 'DEVIS-FACTURES', CAT_ACTIVATED = '0';
INSERT IGNORE INTO `t_droit_categorie` SET CAT_ID = 21, CAT_NOM = 'NOTES DE FRAIS', CAT_ACTIVATED = '0';
INSERT IGNORE INTO `t_droit_categorie` SET CAT_ID = 23, CAT_NOM = 'FACTURES FOURNISSEURS', CAT_ACTIVATED = '0';
INSERT IGNORE INTO `t_droit_categorie` SET CAT_ID = 24, CAT_NOM = 'GESTION DES LIVRAISONS', CAT_ACTIVATED = '0';
INSERT IGNORE INTO `t_droit_categorie` SET CAT_ID = 25, CAT_NOM = 'BOUTIQUES', CAT_ACTIVATED = '0';
INSERT IGNORE INTO `t_droit_categorie` SET CAT_ID = 26, CAT_NOM = 'GESTION SOUS-TRAITANCE', CAT_ACTIVATED = '0';
INSERT IGNORE INTO `t_droit_categorie` SET CAT_ID = 27, CAT_NOM = 'PPSPS', CAT_ACTIVATED = '0';
#REVISION 975
# ES-2006-prime-auto-km
ALTER TABLE `t_prime` ADD `PRIME_IS_DISTANCE` TINYINT NOT NULL DEFAULT '0' COMMENT 'Prime sur la distance prestation oui / non' AFTER `PRIME_UNIT`, ADD `PRIME_IS_DISTANCE_AR` TINYINT NOT NULL DEFAULT '0' COMMENT 'Si prime sur distance presta : prise en compte aller retour prestation oui / non' AFTER `PRIME_IS_DISTANCE`;
#REVISION 982
ALTER TABLE t_salarie
ADD SAL_SST_TAUX_TVA FLOAT(5,2) UNSIGNED NOT NULL COMMENT 'Taux de TVA à appliquer sur le BDC adressé au sous-traitant' AFTER SAL_SSTR_DOC_OBLIGATOIRE;
#REVISION 985
# ES-2238/tr-Changement-hq-ol
ALTER TABLE t_client_status
MODIFY COLUMN CLIENTS_SS_HEURES_SUPP_TYPE ENUM('0', '1', '2', '3') DEFAULT '0' COMMENT '0 : semaine, 1 : jour, 2 : contrat, 3 : Rémunération' NOT NULL;
# ES-1931-CDC-B-Sous-traitance-Convention-et-Automatisation-GL
#IGNORE_START GLEVENTSTEST
CREATE TABLE t_salarie_pour_entreprise_histo LIKE t_salarie_pour_entreprise;
INSERT IGNORE INTO t_salarie_pour_entreprise_histo SELECT * FROM t_salarie_pour_entreprise;
#IGNORE_END GLEVENTSTEST
# ES-2180 Activity Logger
ALTER TABLE `t_log`
ADD `LOG_MODULE` varchar(32) COLLATE 'utf8mb4_general_ci' NOT NULL COMMENT 'Module concerné, depuis le type' AFTER `LOG_TYPE`,
ADD `LOG_OBJECT_PARENT_TYPE` varchar(32) COLLATE 'utf8mb4_general_ci' NOT NULL COMMENT 'Colonne de l\'objet parent à référencer' AFTER `LOG_MODULE`,
ADD `LOG_OBJECT_PARENT_ID` int unsigned NOT NULL COMMENT 'ID de l\'objet parent référencé' AFTER `LOG_OBJECT_PARENT_TYPE`,
ADD `LOG_OBJECT_TYPE` varchar(32) COLLATE 'utf8mb4_general_ci' NOT NULL COMMENT 'Colonne de l\'objet à référencer' AFTER `LOG_OBJECT_PARENT_ID`,
ADD `LOG_OBJECT_ID` int unsigned NOT NULL COMMENT 'ID de l\'objet référencé' AFTER `LOG_OBJECT_TYPE`,
ADD `LOG_ACK_USER` enum('0','1') COLLATE 'utf8mb4_general_ci' NOT NULL DEFAULT '0';
ALTER TABLE `t_log`
ADD INDEX `LOG_MODULE` (`LOG_MODULE`),
ADD INDEX `LOG_OBJECT_PARENT_TYPE` (`LOG_OBJECT_PARENT_TYPE`),
ADD INDEX `LOG_OBJECT_PARENT_ID` (`LOG_OBJECT_PARENT_ID`),
ADD INDEX `LOG_OBJECT_TYPE` (`LOG_OBJECT_TYPE`),
ADD INDEX `LOG_OBJECT_ID` (`LOG_OBJECT_ID`),
ADD INDEX `LOG_ACK_USER` (`LOG_ACK_USER`),
ADD INDEX `LOG_MODULE_LOG_OBJECT_TYPE_LOG_OBJECT_ID` (`LOG_MODULE`, `LOG_OBJECT_PARENT_TYPE`, `LOG_OBJECT_PARENT_ID`);
ALTER TABLE `t_log`
CHANGE `LOG_ITEM_ID` `LOG_ITEM_ID` varchar(64) COLLATE 'utf8mb4_general_ci' NOT NULL COMMENT 'Spé AMP' AFTER `LOG_INFOS_TITLE`,
CHANGE `LOG_ACK` `LOG_ACK` enum('0','1') COLLATE 'utf8mb4_general_ci' NOT NULL DEFAULT '0' COMMENT 'Ack systeme' AFTER `LOG_ITEM_ID`;
UPDATE t_log SET LOG_TYPE = 'presta-phase-sup' WHERE LOG_TYPE = 'phase-sup';
ALTER TABLE `t_log`
ADD `LOG_INFOS_DETAIL` text COLLATE 'utf8mb4_general_ci' NOT NULL AFTER `LOG_INFOS`;
# DT API
ALTER TABLE t_indisponibilite ADD INDISPO_APP_UNIQUE BOOL DEFAULT 0 NOT NULL;
# ES-1964 renommage equipe
ALTER TABLE `t_equipe`
CHANGE `EQU_ID` `SECT_ID` int unsigned NOT NULL AUTO_INCREMENT FIRST,
CHANGE `EQU_NOM` `SECT_NOM` varchar(64) COLLATE 'utf8mb4_general_ci' NOT NULL AFTER `CHANT_ID`,
CHANGE `EQU_NOTES` `SECT_NOTES` varchar(255) COLLATE 'utf8mb4_general_ci' NOT NULL DEFAULT '' AFTER `SECT_NOM`,
CHANGE `EQU_LIEU` `SECT_LIEU` varchar(256) COLLATE 'utf8mb4_general_ci' NULL AFTER `SECT_NOTES`,
RENAME TO `t_section`;
ALTER TABLE `t_planning_chantiers`
CHANGE `EQU_ID` `SECT_ID` int unsigned NOT NULL DEFAULT '0' AFTER `CHANT_ID`;
ALTER TABLE `t_interface`
CHANGE `EQU_ID` `SECT_ID` int unsigned NOT NULL AFTER `INT_DESC`;
ALTER TABLE `t_planning_chantiers` ADD INDEX `SECT_ID` (`SECT_ID`), DROP INDEX `EQU_ID`;
ALTER TABLE `t_piece_ligne` CHANGE `PIEL_LIEU_EQUIPE` `PIEL_LIEU_SECTION` varchar(256) COLLATE 'utf8mb4_general_ci' NULL AFTER `PIEL_LIB_COEF`;
UPDATE `t_contrat_champ` SET `CC_NAME` = '@SALARIE_SECTION' WHERE `CC_NAME` = '@SALARIE_EQUIPE';
UPDATE `t_contrat_champ` SET `CC_NAME` = '@DATE_SECTION_HEURE_QUALIF' WHERE `CC_NAME` = '@DATE_EQUIPE_HEURE_QUALIF';
UPDATE `t_contrat_champ` SET `CC_NAME` = '@CALE_DATE_SECTION_HEURE_QUALIF' WHERE `CC_NAME` = '@CALE_DATE_EQUIPE_HEURE_QUALIF';
UPDATE `t_contrat_champ` SET `CC_NAME` = '@CONTRAT_CHANTIER_SECTION', `CC_LABEL` = 'Section du salarié dans une prestation' WHERE `CC_NAME` = '@CONTRAT_CHANTIER_EQUIPE';
UPDATE t_model_text_default SET MODEL_TEXT = REPLACE(MODEL_TEXT, '@SALARIE_EQUIPE', '@SALARIE_SECTION');
UPDATE t_model_text_default SET MODEL_TEXT = REPLACE(MODEL_TEXT, '@DATE_EQUIPE_HEURE_QUALIF', '@DATE_SECTION_HEURE_QUALIF');
UPDATE t_model_text_default SET MODEL_TEXT = REPLACE(MODEL_TEXT, '@CALE_DATE_EQUIPE_HEURE_QUALIF', '@CALE_DATE_SECTION_HEURE_QUALIF');
UPDATE t_contrat SET CONTRAT_TEXT = REPLACE(CONTRAT_TEXT, '@CONTRAT_CHANTIER_EQUIPE', '@CONTRAT_CHANTIER_SECTION');
#REVISION 986
ALTER TABLE `t_log` DROP `LOG_MODULE`;
#REVISION 990
# ES-1942
ALTER TABLE `t_log` ADD INDEX `LOG_OBJECT_TYPE_LOG_ACK_USER` (`LOG_OBJECT_TYPE`, `LOG_ACK_USER`);
INSERT IGNORE INTO t_droit (CAT_ID, DR_NOM, DR_DESC, DR_DESC_EN, DR_ACTIVATED, DR_IS_CONSULT)
VALUES ('2', 'admin_logs_popup', 'Affichage du journal des activités depuis les alertes', 'Viewing log events from alerts', '1', '1');
INSERT IGNORE INTO t_pour_droit (DR_ID, FONC_ID) SELECT (SELECT DR_ID FROM t_droit WHERE DR_NOM = 'admin_logs_popup'), FONC_ID FROM t_pour_droit WHERE DR_ID = (SELECT DR_ID FROM t_droit WHERE DR_NOM = 'chantiers_gestion');
#REVISION 992
-- ES-2258-GROUPE-F-Retours-bon-de-commande
ALTER TABLE t_bdc ADD BDC_TOTAL_TVA FLOAT(10,2) UNSIGNED NOT NULL AFTER BDC_TOTAL_HT;
# ES-2098-ZEBULON-Devis-Factures-Affichage-informations-par-défaut
ALTER TABLE `t_info_societe`
ADD `ENTREPRISE_REG_MODE` int NOT NULL AFTER `ENTREPRISE_CODE_SECTION`,
ADD `ENTREPRISE_REG_DELAI` int NOT NULL AFTER `ENTREPRISE_REG_MODE`;
# ES-2238/tr-Changement-hq-ol
ALTER TABLE t_client_status
MODIFY COLUMN CLIENTS_SS_HEURES_SUPP_TYPE ENUM('0', '1', '2', '3') DEFAULT '0' COMMENT '0 : semaine, 1 : jour, 2 : contrat, 3 : Rémunération' NOT NULL;
-- ES-2245
INSERT IGNORE INTO t_droit (CAT_ID, DR_NOM, DR_DESC, DR_DESC_EN, DR_ACTIVATED, DR_IS_CONSULT)
VALUES ('7', 'article_gestion_edit', 'Gestion des articles (ajout/suppr/modif)', 'Article management (add/delete/edit)', '1', '0');
INSERT IGNORE INTO t_pour_droit (DR_ID, FONC_ID) SELECT (SELECT DR_ID FROM t_droit WHERE DR_NOM = 'article_gestion_edit'), FONC_ID FROM t_pour_droit WHERE DR_ID = (SELECT DR_ID FROM t_droit WHERE DR_NOM = 'article_gestion');
UPDATE t_droit SET DR_DESC = 'Gestion des articles (lecture seule)', DR_DESC_EN = 'Item management (view only)' WHERE DR_NOM = 'article_gestion';
-- ES-2174-GL-EVENTS-CDC-B-Nouveau-besoin
INSERT IGNORE INTO t_droit (`CAT_ID`, `DR_NOM`, `DR_DESC`, `DR_DESC_EN`, `DR_ACTIVATED`, `DR_IS_CONSULT`)
VALUES ('26', 'admin_sous_traitant', 'Accès en écriture à l\'ensemble des onglets des fiches des sous-traitants.', 'Write access to all tabs on subcontractor\'s sheets.', '0', '0');
-- ES 1927
INSERT IGNORE INTO `t_droit` (`CAT_ID`, `DR_NOM`, `DR_DESC`, `DR_DESC_EN`, `DR_ACTIVATED`, `DR_IS_CONSULT`)
VALUES ('1', 'admin_signataires', 'Configuration des signataires des entités', 'Entity signers configuration', '1', '0');
INSERT IGNORE INTO `t_droit` (`CAT_ID`, `DR_NOM`, `DR_DESC`, `DR_DESC_EN`, `DR_ACTIVATED`, `DR_IS_CONSULT`)
VALUES ('27', 'gestion_dast_prestation', 'Accès à l\'onglet de gestion des DAST', 'Access to the DAST tab', '0', '1');
INSERT IGNORE INTO `t_droit` (`CAT_ID`, `DR_NOM`, `DR_DESC`, `DR_DESC_EN`, `DR_ACTIVATED`, `DR_IS_CONSULT`)
VALUES ('27', 'gestion_dast_creation', 'Pouvoir créer ou modifier des DAST', 'Able to create or modifiy DAST', '1', '0');
INSERT IGNORE INTO `t_droit` (`CAT_ID`, `DR_NOM`, `DR_DESC`, `DR_DESC_EN`, `DR_ACTIVATED`, `DR_IS_CONSULT`)
VALUES ('27', 'gestion_dast_signature', 'Pouvoir signer une DAST', 'Able to sign a DAST', '1', '0');
INSERT IGNORE INTO `t_droit` (`CAT_ID`, `DR_NOM`, `DR_DESC`, `DR_DESC_EN`, `DR_ACTIVATED`, `DR_IS_CONSULT`)
VALUES ('27', 'gestion_dast_reinitialisation', 'Pouvoir réinitialiser une DAST', 'Able to sign a DAST', '1', '0');
INSERT IGNORE INTO `t_droit` (`CAT_ID`, `DR_NOM`, `DR_DESC`, `DR_DESC_EN`, `DR_ACTIVATED`, `DR_IS_CONSULT`)
VALUES ('27', 'gestion_dast_modification_generale', 'Pouvoir modifier les informations générales des DAST d\'une prestation', 'Able to modify the common fields of all DAST of a project', '1', '0');
CREATE TABLE IF NOT EXISTS `t_dast_signataire`
(
`DASI_ID` int unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
`DASI_ENT_ID` int unsigned NOT NULL COMMENT 'Id de l\'entreprise',
`DASI_SIGN_ID` int unsigned NOT NULL COMMENT 'Id du signataire (Id d\'un salarié)',
`DASI_DELEG_IDS` text NOT NULL COMMENT 'Ids des délégataires (Ids de salariés)',
`DASI_QUALITE` text NOT NULL COMMENT 'Agissant en qualité de',
`FILE_ID` text NOT NULL COMMENT 'Fichier de la signature, nommé selon ce qui est attendu dans la classe Document',
`DASI_PAR_DEFAUT` tinyint NOT NULL DEFAULT '0' COMMENT 'Signataire par défaut : 0 = Non, 1 = Oui'
);
CREATE TABLE IF NOT EXISTS `t_chantier_infos_dast`
(
`CID_CHANT_ID` int unsigned NOT NULL COMMENT 'Lien vers le chantier et clef primaire',
`CID_MOA_ID` int unsigned NOT NULL DEFAULT 0 COMMENT 'Id du maitre d\'ouvrage (adressbook)',
`CID_MOA_NOM` varchar(60) NOT NULL COMMENT 'Nom du maitre d\'ouvrage',
`CID_MOA_ADR_1` varchar(64) NOT NULL COMMENT 'Partie 1 de l\'adresse du maitre d\'ouvrage',
`CID_MOA_ADR_2` varchar(64) NOT NULL COMMENT 'Partie 2 de l\'adresse du maitre d\'ouvrage',
`CID_MOA_ADR_3` varchar(64) NOT NULL COMMENT 'Partie 3 de l\'adresse du maitre d\'ouvrage',
`CID_MOA_CP` varchar(10) NOT NULL COMMENT 'Code postal du maitre d\'ouvrage',
`CID_MOA_VILLE` varchar(32) NOT NULL COMMENT 'Code postal du maitre d\'ouvrage',
`CID_MOA_CONTACT` varchar(64) NOT NULL COMMENT 'Nom du contact du maitre d\'ouvrage',
`CID_MOA_CONTACT_MAIL` varchar(64) NOT NULL COMMENT 'Mail du contact du maitre d\'ouvrage',
`CID_TITULAIRE_ID` int unsigned NOT NULL DEFAULT 0 COMMENT 'Id de la prestation du titulaire de marché',
`CID_TITULAIRE_CONTACT_ID` int unsigned NOT NULL COMMENT 'Id du contact du titulaire de marché (entreprise)',
`CID_SIGNATAIRE_ID` int unsigned NOT NULL COMMENT 'Id du signataire des DAST',
`CID_REPRESENTANT_ID` int unsigned NOT NULL COMMENT 'Id du représentant des sous-traitants',
`CID_OPERATION_NOM` varchar(128) NOT NULL COMMENT 'Nom de la prestation',
`CID_AFFAIRE_NOM` varchar(256) NOT NULL COMMENT 'Nom du projet'
);
ALTER TABLE `t_chantier_infos_dast`
ADD PRIMARY KEY `CID_CHANT_ID` (`CID_CHANT_ID`);
UPDATE `t_contrat_champ` SET `CC_NAME` = '@SALARIE_SECTION' WHERE `CC_NAME` = '@SALARIE_EQUIPE';
UPDATE `t_contrat_champ` SET `CC_NAME` = '@DATE_SECTION_HEURE_QUALIF' WHERE `CC_NAME` = '@DATE_EQUIPE_HEURE_QUALIF';
UPDATE `t_contrat_champ` SET `CC_NAME` = '@CALE_DATE_SECTION_HEURE_QUALIF' WHERE `CC_NAME` = '@CALE_DATE_EQUIPE_HEURE_QUALIF';
UPDATE `t_contrat_champ` SET `CC_NAME` = '@CONTRAT_CHANTIER_SECTION', `CC_LABEL` = 'Section du salarié dans une prestation' WHERE `CC_NAME` = '@CONTRAT_CHANTIER_EQUIPE';
UPDATE t_model_text_default SET MODEL_TEXT = REPLACE(MODEL_TEXT, '@SALARIE_EQUIPE', '@SALARIE_SECTION');
UPDATE t_model_text_default SET MODEL_TEXT = REPLACE(MODEL_TEXT, '@DATE_EQUIPE_HEURE_QUALIF', '@DATE_SECTION_HEURE_QUALIF');
UPDATE t_model_text_default SET MODEL_TEXT = REPLACE(MODEL_TEXT, '@CALE_DATE_EQUIPE_HEURE_QUALIF', '@CALE_DATE_SECTION_HEURE_QUALIF');
UPDATE t_contrat SET CONTRAT_TEXT = REPLACE(CONTRAT_TEXT, '@CONTRAT_CHANTIER_EQUIPE', '@CONTRAT_CHANTIER_SECTION');
CREATE TABLE IF NOT EXISTS `t_dast`
(
`DAST_ID` int unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
`DAST_CHANT_ID` int unsigned NOT NULL COMMENT "Sert à savoir à quel chantier est rattaché la DAST",
`DAST_NATURE_TRAVAUX` text NOT NULL,
`DAST_DATE_INTERVENTION` text NOT NULL,
`DAST_CREAT_ID` int unsigned NOT NULL,
`DAST_CREAT_DATE` datetime NOT NULL,
`DAST_MODIF_ID` int unsigned NOT NULL,
`DAST_MODIF_DATE` datetime NOT NULL,
`DAST_SIGNATURE_ID` int unsigned NOT NULL COMMENT "Id de la personne ayant signé la dast",
`DAST_SIGNATURE_DATE` datetime NOT NULL COMMENT "Date de la signature de la dast",
`DAST_PREV_SIGNAT_ID` int unsigned NOT NULL COMMENT "Id de la personne ayant prévenue le signataire",
`DAST_PREV_SIGNAT_DATE` datetime NOT NULL COMMENT "Date de la prévention l'expéditeur",
`DAST_ENVOYEUR_ID` int unsigned NOT NULL COMMENT "Id de la personne ayant envoyé la dast",
`DAST_ENVOYEUR_DATE` datetime NOT NULL COMMENT "Date de l'envoi de la dast",
`DAST_RECEPTION_ID` int unsigned NOT NULL COMMENT "Id de la personne ayant marqué la dast en 'signé MOA'",
`DAST_RECEPTION_DATE` datetime NOT NULL COMMENT "Date du marquage de la dast en 'signé MOA'",
`DAST_ENT_ID` int unsigned NOT NULL,
`DAST_MOA_ID` int unsigned NOT NULL,
`DAST_MOA_NOM` varchar(60) NOT NULL,
`DAST_MOA_ADR_1` varchar(64) NOT NULL,
`DAST_MOA_ADR_2` varchar(64) NOT NULL,
`DAST_MOA_ADR_3` varchar(64) NOT NULL,
`DAST_MOA_CP` varchar(10) NOT NULL,
`DAST_MOA_VILLE` varchar(32) NOT NULL,
`DAST_MOA_CONTACT` varchar(64) NOT NULL,
`DAST_MOA_CONTACT_MAIL` varchar(64) NOT NULL,
`DAST_TITULAIRE_ID` int unsigned NOT NULL,
`DAST_OPERATION_NOM` varchar(128) NOT NULL,
`DAST_AFFAIRE_NOM` varchar(256) NOT NULL,
`DAST_SST_ID` int unsigned NOT NULL,
`DAST_SIGNAT_ID` int unsigned NOT NULL,
`DAST_STATUT` enum ('0','1','2','3','4','5','6') NOT NULL COMMENT "0 = à remplir, 1 = brouillon, 2 = en attente signature GL, 3 = signée GL, 4 = envoyée, 5 = envoyée titulaire marché, 6 = signée MOA"
);
ALTER TABLE `t_salarie` ADD `SAL_SST_NATURE_TRAVAUX` text COLLATE 'utf8mb4_general_ci' NOT NULL COMMENT 'Nature des travaux par défaut pour les DAST' AFTER `SAL_SST_STYLE`;
#REVISION 996
CREATE TEMPORARY TABLE temp_table_t_ndf_libelle_tva_pour_ndf_type AS
SELECT NDF_TYPE_ID, NDF_LIBELLE_TVA_ID
FROM t_ndf_libelle_tva_pour_ndf_type
GROUP BY NDF_TYPE_ID, NDF_LIBELLE_TVA_ID;
TRUNCATE TABLE t_ndf_libelle_tva_pour_ndf_type;
INSERT INTO t_ndf_libelle_tva_pour_ndf_type (NDF_TYPE_ID, NDF_LIBELLE_TVA_ID)
SELECT NDF_TYPE_ID, NDF_LIBELLE_TVA_ID
FROM temp_table_t_ndf_libelle_tva_pour_ndf_type ;
ALTER TABLE t_ndf_libelle_tva_pour_ndf_type
ADD PRIMARY KEY (NDF_TYPE_ID, NDF_LIBELLE_TVA_ID);
#REVISION 997
ALTER TABLE `t_fonction_mg_amp`
ADD `INFOPAYE` VARCHAR(255) DEFAULT '' NOT NULL AFTER `ENTREPRISE_ID`,
ADD `MINIMUM_GARANTI` TINYINT UNSIGNED DEFAULT 0 NOT NULL AFTER `infopaye`;
#REVISION 1003
-- ES-2407/AMP---modif-droit-acces-page-ASSEDIC
INSERT IGNORE INTO t_pour_droit (DR_ID, FONC_ID) SELECT (SELECT DR_ID FROM t_droit WHERE DR_NOM = 'affichage_minimum_garanti'), FONC_ID FROM t_pour_droit WHERE DR_ID = (SELECT DR_ID FROM t_droit WHERE DR_NOM = 'personnel_intitule_officiel');
INSERT IGNORE INTO t_pour_droit (DR_ID, FONC_ID) SELECT (SELECT DR_ID FROM t_droit WHERE DR_NOM = 'affichage_minimum_garanti'), FONC_ID FROM t_pour_droit WHERE DR_ID = (SELECT DR_ID FROM t_droit WHERE DR_NOM = 'personnel_fonctions');
-- ES-2254
#IGNORE_START BOBAZAR
ALTER TABLE `t_bbz_objectif` ADD `OBB_ENTREPRISE_ID` INT NOT NULL DEFAULT '1' AFTER `OBB_YEAR`;
#IGNORE_END BOBAZAR
-- ES-1890
INSERT IGNORE INTO `t_droit` (`CAT_ID`, `DR_NOM`, `DR_DESC`, `DR_DESC_EN`, `DR_ACTIVATED`, `DR_IS_CONSULT`) VALUES ( '1', 'affaires_nub_pdf', 'Page impression étiquettes NUB', 'Print page for NUB labels', '1', '1');
INSERT IGNORE INTO t_pour_droit (DR_ID, FONC_ID)
SELECT (SELECT DR_ID FROM t_droit WHERE DR_NOM = 'affaires_nub_pdf'), FONC_ID
FROM t_pour_droit
WHERE DR_ID = (SELECT DR_ID FROM t_droit WHERE DR_NOM = 'affaires_feuille_route_perso');
#REVISION 1006
#ES-2405 Retour des DAST #4
ALTER TABLE `t_dast`
DROP `DAST_MOA_CONTACT`,
DROP `DAST_MOA_CONTACT_MAIL`;
#REVISION 1010
ALTER TABLE `t_due` CHANGE `DUE_AR_FLAG` `DUE_AR_FLAG` enum('0','1','2') COLLATE 'utf8mb4_general_ci' NOT NULL DEFAULT '0' COMMENT '0: En attente 1: Erreur 2: Validée' AFTER `DUE_DATE`;
#REVISION 1021
ALTER TABLE `t_article_champ` ADD `AC_AFFICHAGE_IMPR` tinyint NOT NULL DEFAULT '0' COMMENT 'Doit on afficher ce champ perso dans l\'impression de sortie matériel?';
#REVISION 1026
-- ESS-3484-Accès-à-EventSoft-–-Affichage-du-mois-de-décembre
ALTER TABLE `t_info_societe` CHANGE `LIMIT_PRESTA_FIN` `LIMIT_PRESTA_FIN` INT(3) UNSIGNED NOT NULL DEFAULT '15';
-- monnaie
ALTER TABLE `t_monnaie` ADD CONSTRAINT unique_iso_code UNIQUE (`ISO_CODE`);
INSERT IGNORE INTO `t_monnaie` (`NAME`, `ISO_CODE`, `SIGN`, `BLANK`, `FORMAT`, `CONVERSION_RATE`)
VALUES ('Dirham des Émirats arabes unis', 'AED', 'د.إ', 1, 2, 3.979939),
('Afghani afghan', 'AFN', '؋', 1, 2, 78.410261),
('Lek albanais', 'ALL', 'L', 1, 2, 99.350331),
('Dram arménien', 'AMD', '֏', 1, 2, 427.501425),
('Florin des Antilles néerlandaises', 'ANG', 'ƒ', 1, 2, 1.955407),
('Kwanza angolais', 'AOA', 'Kz', 1, 2, 991.005543),
('Peso argentin', 'ARS', '$', 1, 2, 1153.983848),
('Dollar australien', 'AUD', 'A$', 1, 1, 1.723916),
('Florin arubais', 'AWG', 'ƒ', 1, 2, 1.950577),
('Manat azéri', 'AZN', '₼', 1, 2, 1.846513),
('Mark convertible bosniaque', 'BAM', 'KM', 1, 2, 1.955807),
('Dollar barbadien', 'BBD', 'Bds$', 1, 2, 2.190607),
('Taka bangladais', 'BDT', '৳', 1, 2, 131.82044),
('Lev bulgare', 'BGN', 'лв', 1, 2, 1.953468),
('Dinar bahreïni', 'BHD', '.د.ب', 1, 2, 0.408501),
('Franc burundais', 'BIF', 'FBu', 1, 2, 3214.210717),
('Dollar bermudien', 'BMD', '$', 1, 2, 1.083654),
('Dollar de Brunei', 'BND', 'B$', 1, 2, 1.443805),
('Boliviano bolivien', 'BOB', 'Bs.', 1, 2, 7.497025),
('Réal brésilien', 'BRL', 'R$', 1, 2, 6.272083),
('Dollar bahaméen', 'BSD', 'B$', 1, 2, 1.084904),
('Bitcoin', 'BTC', '₿', 1, 2, 1.2553402e-05),
('Ngultrum bhoutanais', 'BTN', 'Nu.', 1, 2, 94.288314),
('Pula botswanais', 'BWP', 'P', 1, 2, 14.752049),
('Rouble biélorusse', 'BYN', 'Br', 1, 2, 3.550612),
('Dollar bélizien', 'BZD', 'BZ$', 1, 2, 2.179307),
('Dollar canadien', 'CAD', 'C$', 1, 1, 1.557373),
('Franc congolais', 'CDF', 'FC', 1, 2, 3115.50453),
('Franc suisse', 'CHF', 'CHF', 1, 5, 0.954532),
('Unité de compte chilienne (UF)', 'CLF', 'UF', 1, 2, 0.026197),
('Peso chilien', 'CLP', '$', 1, 2, 1005.293352),
('Yuan chinois', 'CNY', '¥', 1, 2, 7.839422),
('Yuan chinois offshore', 'CNH', '¥', 1, 2, 7.851233),
('Peso colombien', 'COP', '$', 1, 2, 4450.014837),
('Colon costaricien', 'CRC', '₡', 1, 2, 548.601829),
('Peso cubain convertible', 'CUC', '$', 1, 2, 1.083654),
('Peso cubain', 'CUP', '$', 1, 2, 28.716821),
('Escudo cap-verdien', 'CVE', 'Esc', 1, 2, 110.265368),
('Couronne tchèque', 'CZK', 'Kč', 1, 2, 24.946469),
('Franc djiboutien', 'DJF', 'Fdj', 1, 2, 193.200644),
('Couronne danoise', 'DKK', 'kr', 1, 2, 7.460309),
('Peso dominicain', 'DOP', 'RD$', 1, 2, 67.870226),
('Dinar algérien', 'DZD', 'دج', 1, 2, 144.407481),
('Livre égyptienne', 'EGP', '£', 1, 2, 54.918183),
('Nakfa érythréen', 'ERN', 'Nfk', 1, 2, 16.254804),
('Birr éthiopien', 'ETB', 'Br', 1, 2, 141.850973),
('Euro', 'EUR', '€', 1, 2, 1.0),
('Dollar fidjien', 'FJD', 'FJ$', 1, 2, 2.48894),
('Livre des îles Malouines', 'FKP', '£', 1, 2, 0.839134),
('Livre sterling', 'GBP', '£', 1, 2, 0.839814),
('Lari géorgien', 'GEL', '₾', 1, 2, 3.007182),
('Livre de Guernesey', 'GGP', '£', 1, 2, 0.839134),
('Cédi ghanéen', 'GHS', '₵', 1, 2, 16.817056),
('Livre de Gibraltar', 'GIP', '£', 1, 2, 0.839134),
('Dalasi gambien', 'GMD', 'D', 1, 2, 77.485406),
('Franc guinéen', 'GNF', 'FG', 1, 2, 9381.031278),
('Quetzal guatémaltèque', 'GTQ', 'Q', 1, 2, 8.368028),
('Dollar guyanien', 'GYD', 'G$', 1, 2, 226.990757),
('Dollar de Hong Kong', 'HKD', 'HK$', 1, 2, 8.420802),
('Lempira hondurien', 'HNL', 'L', 1, 2, 27.744093),
('Kuna croate', 'HRK', 'kn', 1, 2, 7.536165),
('Gourde haïtienne', 'HTG', 'G', 1, 2, 142.450475),
('Forint hongrois', 'HUF', 'Ft', 1, 2, 398.113084),
('Roupie indonésienne', 'IDR', 'Rp', 1, 2, 17663.553893),
('Shekel israélien', 'ILS', '₪', 1, 2, 3.932417),
('Livre de l\'île de Man', 'IMP', '£', 1, 2, 0.839134),
('Roupie indienne', 'INR', '₹', 1, 2, 94.4396),
('Dinar irakien', 'IQD', 'ع.د', 1, 2, 1421.304739),
('Rial iranien', 'IRR', '﷼', 1, 2, 45621.817492),
('Couronne islandaise', 'ISK', 'kr', 1, 2, 147.128069),
('Livre de Jersey', 'JEP', '£', 1, 2, 0.839134),
('Dollar jamaïcain', 'JMD', 'J$', 1, 2, 170.080567),
('Dinar jordanien', 'JOD', 'د.ا', 1, 2, 0.768748),
('Yen japonais', 'JPY', '¥', 1, 2, 160.429542),
('Shilling kényan', 'KES', 'Sh', 1, 2, 140.400468),
('Som kirghize', 'KGS', 'лв', 1, 2, 94.765925),
('Riel cambodgien', 'KHR', '៛', 1, 2, 4348.014497),
('Franc comorien', 'KMF', 'CF', 1, 2, 493.116993),
('Won nord-coréen', 'KPW', '₩', 1, 2, 975.317513),
('Won sud-coréen', 'KRW', '₩', 1, 2, 1568.604902),
('Dinar koweïtien', 'KWD', 'د.ك', 1, 2, 0.333863),
('Dollar des îles Caïmans', 'KYD', '$', 1, 2, 0.904103),
('Tenge kazakh', 'KZT', '₸', 1, 2, 532.441775),
('Kip laotien', 'LAK', '₭', 1, 2, 23491.078323),
('Livre libanaise', 'LBP', 'ل.ل', 1, 2, 97211.824119),
('Roupie srilankaise', 'LKR', 'Rs', 1, 2, 320.551069),
('Dollar libérien', 'LRD', 'L$', 1, 2, 216.990723),
('Loti lesothan', 'LSL', 'L', 1, 2, 19.665666),
('Litas lituanien', 'LTL', 'Lt', 1, 2, 3.199748),
('Lats letton', 'LVL', 'Ls', 1, 2, 0.655492),
('Dinar libyen', 'LYD', 'ل.د', 1, 2, 5.237017),
('Dirham marocain', 'MAD', 'د.م.', 1, 2, 10.549735),
('Leu moldave', 'MDL', 'L', 1, 2, 19.692066),
('Ariary malgache', 'MGA', 'Ar', 1, 2, 5082.016944),
('Denar macédonien', 'MKD', 'ден', 1, 2, 61.530205),
('Kyat birman', 'MMK', 'K', 1, 2, 2274.688295),
('Tugrik mongol', 'MNT', '₮', 1, 2, 3760.725259),
('Pataca macanaise', 'MOP', 'P', 1, 2, 8.684129),
('Ouguiya mauritanien', 'MRU', 'UM', 1, 2, 43.279144),
('Roupie mauricienne', 'MUR', '₨', 1, 2, 49.003226),
('Rufiyaa maldivienne', 'MVR', 'Rf', 1, 2, 16.699512),
('Kwacha malawien', 'MWK', 'MK', 1, 2, 1881.306273),
('Peso mexicain', 'MXN', '$', 1, 2, 21.962592),
('Ringgit malaisien', 'MYR', 'RM', 1, 2, 4.783793),
('Metical mozambicain', 'MZN', 'MT', 1, 2, 69.249507),
('Dollar namibien', 'NAD', '$', 1, 2, 19.665666),
('Naira nigérian', 'NGN', '₦', 1, 2, 1641.735596),
('Córdoba nicaraguayen', 'NIO', 'C$', 1, 2, 39.930133),
('Couronne norvégienne', 'NOK', 'kr', 1, 2, 11.768374),
('Roupie népalaise', 'NPR', 'Rs', 1, 2, 150.861503),
('Dollar néo-zélandais', 'NZD', 'NZ$', 1, 2, 1.897651),
('Rial omanais', 'OMR', '﷼', 1, 2, 0.417191),
('Balboa panaméen', 'PAB', 'B/.', 1, 2, 1.084904),
('Sol péruvien', 'PEN', 'S/.', 1, 2, 3.963913),
('Kina papou-néo-guinéen', 'PGK', 'K', 1, 2, 4.430015),
('Peso philippin', 'PHP', '₱', 1, 2, 61.990447),
('Roupie pakistanaise', 'PKR', '₨', 1, 2, 303.787013),
('Zloty polonais', 'PLN', 'zł', 1, 2, 4.171614),
('Guarani paraguayen', 'PYG', '₲', 1, 2, 8591.028644),
('Riyal qatari', 'QAR', 'ر.ق', 1, 2, 3.955413),
('Leu roumain', 'RON', 'lei', 1, 2, 4.976792),
('Dinar serbe', 'RSD', 'дин', 1, 2, 117.180391),
('Rouble russe', 'RUB', '₽', 1, 2, 96.500322),
('Franc rwandais', 'RWF', 'RF', 1, 2, 1527.605093),
('Riyal saoudien', 'SAR', 'ر.س', 1, 2, 4.065514),
('Dollar des îles Salomon', 'SBD', '$', 1, 2, 9.11492),
('Roupie seychelloise', 'SCR', '₨', 1, 2, 15.978514),
('Livre soudanaise', 'SDG', 'ج.س.', 1, 2, 651.276189),
('Couronne suédoise', 'SEK', 'kr', 1, 2, 10.930168),
('Dollar de Singapour', 'SGD', 'S$', 1, 2, 1.442239),
('Livre de Sainte-Hélène', 'SHP', '£', 1, 2, 0.851582),
('Leone sierra-léonais', 'SLE', 'Le', 1, 2, 24.761887),
('Shilling somalien', 'SOS', 'Sh', 1, 2, 620.102068),
('Dollar surinamais', 'SRD', '$', 1, 2, 38.798765),
('Dobra santoméen', 'STD', 'Db', 1, 2, 22429.441902),
('Colon salvadorien', 'SVC', '$', 1, 2, 9.493032),
('Livre syrienne', 'SYP', 'ل.س', 1, 2, 14090.172453),
('Lilangeni swazi', 'SZL', 'E', 1, 2, 19.660066),
('Baht thaïlandais', 'THB', '฿', 1, 2, 36.579852),
('Somoni tadjik', 'TJS', 'SM', 1, 2, 11.826039),
('Manat turkmène', 'TMT', 'm', 1, 2, 3.803624),
('Dinar tunisien', 'TND', 'د.ت', 1, 2, 3.351211),
('Pa\'anga tongien', 'TOP', 'T$', 1, 2, 2.538029),
('Livre turque', 'TRY', '₺', 1, 2, 39.445863),
('Dollar trinidadien', 'TTD', 'TT$', 1, 2, 7.365025),
('Dollar taïwanais', 'TWD', 'NT$', 1, 2, 35.589393),
('Shilling tanzanien', 'TZS', 'TSh', 1, 2, 2869.709568),
('Hryvnia ukrainienne', 'UAH', '₴', 1, 2, 44.718549),
('Shilling ougandais', 'UGX', 'USh', 1, 2, 3981.013273),
('Dollar américain', 'USD', '$', 1, 1, 1.083654),
('Peso uruguayen', 'UYU', '$U', 1, 2, 46.230154),
('Sum ouzbek', 'UZS', 'сўм', 1, 2, 14016.046732),
('Dong vietnamien', 'VND', '₫', 1, 2, 27638.585401),
('Vatu vanuatuan', 'VUV', 'Vt', 1, 2, 134.525423),
('Tala samoan', 'WST', 'T', 1, 2, 3.053818),
('Franc CFA (BEAC)', 'XAF', 'FCFA', 1, 2, 655.959187),
('Dollar des Caraïbes orientales', 'XCD', 'EC$', 1, 2, 2.928628),
('Droits de tirage spéciaux', 'XDR', 'SDR', 1, 2, 0.815803),
('Franc CFA (BCEAO)', 'XOF', 'CFA', 1, 2, 655.959187),
('Franc CFP', 'XPF', '₣', 1, 2, 119.331742),
('Rial yéménite', 'YER', '﷼', 1, 2, 267.449603),
('Rand sud-africain', 'ZAR', 'R', 1, 2, 19.778218),
('Kwacha zambien (ancien)', 'ZMK', 'ZK', 1, 2, 9754.186788),
('Kwacha zambien', 'ZMW', 'ZK', 1, 2, 30.894103),
('Dollar zimbabwéen', 'ZWL', 'Z$', 1, 2, 348.936021);
UPDATE t_crontab SET CRON_ACTIVE = 1 WHERE CRON_PATH = 'script_taux_change.php';
INSERT IGNORE INTO `t_crontab` (`CRON_TITLE`, `CRON_ACTIVE`, `CRON_ORDER`, `CRON_CRONTAB`, `CRON_PATH`, `CRON_LAST_EXEC`) VALUES ('', 1, 90, '0 20 * * *', 'script_taux_change.php', NULL);
#REVISION 1027
ALTER TABLE `t_salarie_status`
CHANGE `SS_MAJO_DEB_SUP25` `SS_MAJO_DEB_SUP25` float(8,2) NULL DEFAULT '36.00' AFTER `SS_MAJO_FERIE14_AMP`,
CHANGE `SS_MAJO_FIN_SUP25` `SS_MAJO_FIN_SUP25` float(8,2) NULL DEFAULT '43.00' AFTER `SS_MAJO_DEB_SUP25`,
CHANGE `SS_MAJO_DEB_SUP25_2` `SS_MAJO_DEB_SUP25_2` float(8,2) NULL AFTER `SS_MAJO_SUP25`,
CHANGE `SS_MAJO_FIN_SUP25_2` `SS_MAJO_FIN_SUP25_2` float(8,2) NULL AFTER `SS_MAJO_DEB_SUP25_2`,
CHANGE `SS_MAJO_DEB_SUP25_3` `SS_MAJO_DEB_SUP25_3` float(8,2) NULL AFTER `SS_MAJO_SUP25_2`,
CHANGE `SS_MAJO_FIN_SUP25_3` `SS_MAJO_FIN_SUP25_3` float(8,2) NULL AFTER `SS_MAJO_DEB_SUP25_3`;
ALTER TABLE `t_client_status`
CHANGE `CLIENTS_SS_MAJO_DEB_SUP25` `CLIENTS_SS_MAJO_DEB_SUP25` float(8,2) NOT NULL DEFAULT '36.0' AFTER `CLIENTS_SS_MAJO_FERIE14`,
CHANGE `CLIENTS_SS_MAJO_FIN_SUP25` `CLIENTS_SS_MAJO_FIN_SUP25` float(8,2) NOT NULL DEFAULT '43.0' AFTER `CLIENTS_SS_MAJO_DEB_SUP25`,
CHANGE `CLIENTS_SS_MAJO_DEB_SUP25_2` `CLIENTS_SS_MAJO_DEB_SUP25_2` float(8,2) NULL AFTER `CLIENTS_SS_MAJO_SUP25`,
CHANGE `CLIENTS_SS_MAJO_FIN_SUP25_2` `CLIENTS_SS_MAJO_FIN_SUP25_2` float(8,2) NULL AFTER `CLIENTS_SS_MAJO_DEB_SUP25_2`,
CHANGE `CLIENTS_SS_MAJO_DEB_SUP25_3` `CLIENTS_SS_MAJO_DEB_SUP25_3` float(8,2) NULL AFTER `CLIENTS_SS_MAJO_SUP25_2`,
CHANGE `CLIENTS_SS_MAJO_FIN_SUP25_3` `CLIENTS_SS_MAJO_FIN_SUP25_3` float(8,2) NULL AFTER `CLIENTS_SS_MAJO_DEB_SUP25_3`;
#REVISION 1030
-- ES-143/ARTO---Demande-de-dispo-depuis-les-tournées
INSERT IGNORE INTO `t_model_text_default` (`MODEL_ID`, `MODEL_IDX`, `MODEL_ENT_ID`, `MODEL_CRS_TYPE_ID`, `MODEL_LABEL`, `MODEL_CATEGORY`, `MODEL_TYPE`, `MODEL_TEXT`, `MODEL_OBJECT`, `MODEL_SMS`, `MODEL_LOCK`)
VALUES (NULL, '627', '1', '0', 'Demande de dispo tournée', 'MSG', 'message_demande_dispo_tournee','', '0', '', '0');
-- ES-96
CREATE TABLE IF NOT EXISTS `t_ndf_commentaire`
(
`NDFC_ID` int NOT NULL AUTO_INCREMENT PRIMARY KEY,
`NDF_ID` int NOT NULL,
`NDFC_TEXTE` text NOT NULL,
`NDFC_DATECREAT` datetime NOT NULL,
`NDFC_INITCREAT` datetime NOT NULL,
`NDFC_DATEMAJ` datetime NOT NULL,
`NDFC_INITMAJ` datetime NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
ALTER TABLE `t_ndf_commentaire`
ADD INDEX `NDF_ID` (`NDF_ID`);
INSERT IGNORE INTO `t_droit` (`CAT_ID`, `DR_NOM`, `DR_DESC`, `DR_DESC_EN`, `DR_ACTIVATED`, `DR_IS_CONSULT`)
VALUES ('21', 'cachets_ndf_commentaire', 'Affichage / modification des commentaires des notes de frais', 'Display / modify comments for expenses bills', 1, 1);
#REVISION 1036
-- ES-1588 - [GL Events] - Gestion des transports V3.1
INSERT IGNORE INTO `t_droit_categorie` (`CAT_ID`, `CAT_NOM`, `CAT_ACTIVATED`)
VALUES (28, 'GESTION DES TRANSPORTS', '0');
INSERT IGNORE INTO t_droit (CAT_ID, DR_NOM, DR_DESC, DR_DESC_EN, DR_ACTIVATED, DR_IS_CONSULT)
VALUES (28, 'suivi_transports', 'Accès au suivi des transports (lecture seule)', 'Access to transport tracking (read-only)', '1', '1'),
(28, 'suivi_transports_admin', 'Accès en écriture au suivi des transports', 'Write access to transport tracking', '1', '0'),
(28, 'suivi_transports_add_quai', 'Attribuer des ressources de type \"Quai\"', 'Assign resources of type \"Dock\"', '1', '0'),
(28, 'courses_vue_acquittement', 'Page d\'acquittement des modification de course', 'Delivery acknowledgment page', '1', '0');
ALTER TABLE `t_course_type`
ADD `CRS_TYPE_IS_TRANSPORT` TINYINT(1) UNSIGNED NOT NULL AFTER `CRS_TYPE_EXC_FINANCE`;
ALTER TABLE `t_camion`
ADD `CAM_IS_REMORQUE` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0' AFTER `CAM_ATTRIBUE`,
ADD `CAM_IS_QUAI` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0' AFTER `CAM_IS_REMORQUE`;
ALTER TABLE `t_tournee`
ADD `TOUR_STATUT` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1'
COMMENT 'Statut du transport\r\n1 : Demande de transport\r\n2 : En consultation\r\n3 : Calé\r\n4 : Modification\r\n5 : Annulé\r\n6 : Terminé' AFTER `TOUR_NOM`,
ADD `TOUR_CODE_CAMION` VARCHAR(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL AFTER `TOUR_STATUT`;
ALTER TABLE `t_course`
ADD `CRS_STATUS_CHARGE_EN_COURS` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'Est-ce que le chargement est en cours ?' AFTER `CRS_STATUS`,
ADD `CRS_STATUS_CHARGE_EN_COURS_DATE` DATETIME NOT NULL AFTER `CRS_STATUS_CHARGE_EN_COURS`,
ADD `CRS_STATUS_DECHARGE_EN_COURS` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0' AFTER `CRS_STATUS_CHARGE`,
ADD `CRS_STATUS_DECHARGE_EN_COURS_DATE` DATETIME NOT NULL AFTER `CRS_STATUS_DECHARGE_EN_COURS`,
ADD `CRS_IS_TRANSPORT` TINYINT(1) UNSIGNED NOT NULL AFTER `CRS_ORDER`,
ADD `CRS_VEH_TYPE_ID` INT(11) UNSIGNED NOT NULL DEFAULT '0' AFTER `CRS_IS_TRANSPORT`;
ALTER TABLE `t_tournee`
ADD `TOUR_IDX` INT(11) UNSIGNED NOT NULL AFTER `TOUR_ID`;
ALTER TABLE `t_tournee`
ADD `TOUR_ETAT` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0'
COMMENT 'Etat du transport :\r\n - 0 : Aucun\r\n - 1 : En cours de chargement\r\n - 2 : Chargé\r\n - 3 : Sur site\r\n - 4 : En cours de déchargement\r\n - 5 : Déchargé\r\n - 6 : Livré\r\n - 7 : Signé';
ALTER TABLE `t_tournee`
ADD `TOUR_PARENT_ID` INT(11) UNSIGNED NOT NULL AFTER `TOUR_CODE_CAMION`;
ALTER TABLE `t_tournee`
ADD `TOUR_TYPE_LIAISON_ID` TINYINT(1) UNSIGNED NOT NULL COMMENT 'Types de liaison :\r\n1 - Multi chargement\r\n2 - Multi livraison\r\n3 - Mixte' AFTER TOUR_PARENT_ID;
CREATE TABLE IF NOT EXISTS t_course_champ_modifs (
CCM_ID int(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
CCM_CRS_ID int(11) UNSIGNED NOT NULL,
CCM_CHAMP_NAME varchar(256) COLLATE utf8mb4_unicode_ci NOT NULL,
CCM_OLD_VALUE text COLLATE utf8mb4_unicode_ci NOT NULL,
CCM_NEW_VALUE text COLLATE utf8mb4_unicode_ci NOT NULL,
CCM_DATE datetime NOT NULL,
CCM_SAL_ID_MODIF int(11) UNSIGNED NOT NULL COMMENT 'ID du salarié qui demande la modification',
CCM_STATUT tinyint(1) UNSIGNED NOT NULL DEFAULT '0' COMMENT '0 : A valider, 1 : Validée',
CCM_CALLBACK varchar(20) COLLATE utf8mb4_unicode_ci NULL COMMENT 'Action à exécuter après aquittement'
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT='Modifications des courses de transport à aquitter';
#REVISION 1037
-- Activation Synchro Google Calendar
INSERT IGNORE INTO `t_crontab` (`CRON_TITLE`, `CRON_ACTIVE`, `CRON_ORDER`, `CRON_CRONTAB`, `CRON_PATH`) VALUES ('Gestion synchro Google Agenda', 1, 1, '0,30 * * * *', 'script_sync_google.php');
UPDATE t_droit SET DR_ACTIVATED = '1' WHERE DR_NOM = 'sync_google_calendar';
INSERT IGNORE INTO t_pour_droit (DR_ID, FONC_ID) SELECT (SELECT DR_ID FROM t_droit WHERE DR_NOM = 'sync_google_calendar'), FONC_ID FROM t_pour_droit WHERE DR_ID = (SELECT DR_ID FROM t_droit WHERE DR_NOM = 'home');
#REVISION 1040
# Les droits du module de suivi des transports sont désactivés par défaut
UPDATE t_droit
SET DR_ACTIVATED = '0'
WHERE CAT_ID = 28;
#REVISION 1041
# On réinitialise les types de liaison. Désormais, ils sont rattachés aux parents uniquement.
UPDATE t_tournee
SET TOUR_TYPE_LIAISON_ID = 0,
TOUR_PARENT_ID = 0
WHERE TOUR_PARENT_ID > 0;
ALTER TABLE `t_course_champ_modifs`
ADD `CCM_OLD_TOUR_STATUT` TINYINT(2) UNSIGNED NOT NULL AFTER CCM_CALLBACK;
#REVISION 1042
ALTER TABLE `t_contrat` CHANGE `CONTRAT_TEXT` `CONTRAT_TEXT` longtext COLLATE 'utf8mb4_general_ci' NULL AFTER `CONTRAT_PERIODE_ESSAI`;
UPDATE t_contrat SET CONTRAT_TEXT = NULL WHERE CONTRAT_TEXT = '';
CREATE INDEX idx_due_main_filter ON t_due (DUE_ENTREPRISE_ID, DUE_SIGNING_API, DUE_CT_SIGNATAIRE_OK, DUE_CONTRAT_A_ENVOYER, DUE_SIGNING_API_ID(367), DUE_CT_STATUT, DUE_CONTRAT_SIGNE_MANU, DUE_SIGNING_API_STATUT_DOC, DUE_DATE_EMB);
CREATE INDEX idx_due_sal_id ON t_due (DUE_SAL_ID);
CREATE INDEX idx_due_ct_signataire ON t_due (DUE_CT_SIGNATAIRE);
CREATE INDEX idx_due_fonc_id ON t_due (DUE_FONC_ID);
CREATE INDEX idx_due_chant_id ON t_due (DUE_CHANT_ID);
CREATE INDEX idx_salarie_status ON t_salarie (SAL_STATUS);
CREATE INDEX idx_ss_do_contrat ON t_salarie_status (SS_ID, SS_DO_CONTRAT);
CREATE INDEX idx_sspc ON t_salarie_status_pour_contrat (ENTREPRISE_ID, SS_ID, CONTRAT_ID);
CREATE INDEX idx_fonc_id ON t_fonction (FONC_ID);
CREATE INDEX idx_chant_id ON t_chantier (CHANT_ID);
CREATE INDEX idx_spm ON t_salarie_pour_matricule (SAL_ID, ENTREPRISE_ID);
CREATE INDEX idx_pfr ON t_pour_fonction_remu (FONC_ID, SAL_ID, ENTREPRISE_ID);
#REVISION 1044
-- ES-2594/Gestion-de-la-couleur--des-SSTR
ALTER TABLE t_salarie DROP COLUMN SAL_SST_STYLE;
-- ES-2473/ZEBULON-Devis/Factures-MAJ-de-l'impression
ALTER TABLE t_info_societe
ADD COLUMN DEFAUT_COM_DEVIS TEXT AFTER FEUILLE_TOURNEE_COM,
ADD COLUMN DEFAUT_COM_FACTURE TEXT AFTER DEFAUT_COM_DEVIS;
-- ES-2542 IVS TECHNOLOGIES - Création profil restreint
INSERT IGNORE INTO t_droit (CAT_ID, DR_NOM, DR_DESC, DR_DESC_EN, DR_ACTIVATED, DR_IS_CONSULT) VALUES ('1', 'login_hors_lan', 'Connexion en dehors du réseau local', 'Connecting outside the local network', '1', '1');
INSERT IGNORE INTO t_pour_droit (DR_ID, FONC_ID) SELECT (SELECT DR_ID FROM t_droit WHERE DR_NOM = 'login_hors_lan'), FONC_ID FROM t_pour_droit WHERE DR_ID = (SELECT DR_ID FROM t_droit WHERE DR_NOM = 'login');
INSERT IGNORE INTO t_droit (CAT_ID, DR_NOM, DR_DESC, DR_DESC_EN, DR_ACTIVATED, DR_IS_CONSULT) VALUES ('1', 'login_hors_plage', 'Connexion en dehors des heures spécifiques, par défaut 8h-18h lundi-vendredi (paramétrage Intrapole)', 'Connection outside specific hours, by default 8 a.m.-6 p.m. Monday-Friday (Intrapole setting)', '1', '1');
INSERT IGNORE INTO t_pour_droit (DR_ID, FONC_ID) SELECT (SELECT DR_ID FROM t_droit WHERE DR_NOM = 'login_hors_plage'), FONC_ID FROM t_pour_droit WHERE DR_ID = (SELECT DR_ID FROM t_droit WHERE DR_NOM = 'login');
UPDATE `t_settings` SET `SET_VALUE` = '1046' WHERE `SET_NAME` = 'db_version';
Exécution de la commande : mysql -h mysql -uroot -proot -e 'SET autocommit=0; USE 1579-8.4; source /var/www/html/1579-8.4/.devtools/update_dev.sql; COMMIT;'
mysql: [Warning] Using a password on the command line interface can be insecure.
Exécution de la commande : mysql -h mysql -uroot -proot -e 'SET autocommit=0; USE 1579-8.4; source /var/www/html/1579-8.4/.devtools/views.sql; COMMIT;'
mysql: [Warning] Using a password on the command line interface can be insecure.
Exécution de la commande : sed -i "s/#NUMEROPR/1579/g; s/#VERSIONPHP/8.4/g" /var/www/html/1579-8.4/.devtools/update_branches_dynamiques.sql
Exécution de la commande : mysql -h mysql -uroot -proot -e 'SET autocommit=0; USE 1579-8.4; source /var/www/html/1579-8.4/.devtools/update_branches_dynamiques.sql; COMMIT;'
mysql: [Warning] Using a password on the command line interface can be insecure.
Exécution de la commande : cd /var/www/html/1579-8.4 && git fetch --all && git reset --hard origin/$(git rev-parse --abbrev-ref HEAD) && git pull
Fetching origin
HEAD is now at 3faace35b .
Already up to date.
From github.com:Intrapole/EventSoft
4d523016e..41294ceeb ES-2287/DECOROOM---BDC-sur-tournées -> origin/ES-2287/DECOROOM---BDC-sur-tournées
824ed0549..cb4c4f9ad ES-2624/Problème-CP-hors-France -> origin/ES-2624/Problème-CP-hors-France
* [new branch] ES-2665/pb-Evensoft-/-dispo-des-véhicules -> origin/ES-2665/pb-Evensoft-/-dispo-des-véhicules
21dd50f8f..e509e1c57 develop -> origin/develop
Exécution de la commande : cd /var/www/html/1579-8.4 && git fetch --all && git reset --hard origin/$(git rev-parse --abbrev-ref HEAD) && git pull
Fetching origin
HEAD is now at 7adc1c3d8 Merge branch 'develop' into ES-2576/TKES2703B1---pb-avec-le-planning-mobile-les-sous-traitant-ne-voient-qu'un-prestation-par-jour
Already up to date.
From github.com:Intrapole/EventSoft
3faace35b..7adc1c3d8 ES-2576/TKES2703B1---pb-avec-le-planning-mobile-les-sous-traitant-ne-voient-qu'un-prestation-par-jour -> origin/ES-2576/TKES2703B1---pb-avec-le-planning-mobile-les-sous-traitant-ne-voient-qu'un-prestation-par-jour
* [new branch] ES-2666-BTKES2803B1-des-document-en-attentes-ne-sont-pas-present-dans-le-tableau-de-bord -> origin/ES-2666-BTKES2803B1-des-document-en-attentes-ne-sont-pas-present-dans-le-tableau-de-bord
e509e1c57..079172968 develop -> origin/develop
Exécution de la commande : cd /var/www/html/1579-8.4 && git fetch --all && git reset --hard origin/$(git rev-parse --abbrev-ref HEAD) && git pull
Fetching origin
HEAD is now at aa621df82 ES-2576
Already up to date.
From github.com:Intrapole/EventSoft
7adc1c3d8..aa621df82 ES-2576/TKES2703B1---pb-avec-le-planning-mobile-les-sous-traitant-ne-voient-qu'un-prestation-par-jour -> origin/ES-2576/TKES2703B1---pb-avec-le-planning-mobile-les-sous-traitant-ne-voient-qu'un-prestation-par-jour
d4d133e14..5af777cbe ES-1588-GL-EVENTS-Gestion-des-transports-V3-1-PARTIE-1 -> origin/ES-1588-GL-EVENTS-Gestion-des-transports-V3-1-PARTIE-1
a6a0b5118..48cc88cfc ES-1725/GL-EVENTS---Gestion-des-courses-désaffectées-d'une-tournée -> origin/ES-1725/GL-EVENTS---Gestion-des-courses-désaffectées-d'une-tournée
* [new branch] ES-1956/AMP---Amélioration-duplication-de-phases -> origin/ES-1956/AMP---Amélioration-duplication-de-phases
* [new branch] ES-1976/AMP---Salaire,-message-pour-filtre -> origin/ES-1976/AMP---Salaire,-message-pour-filtre
41294ceeb..6a4c24659 ES-2287/DECOROOM---BDC-sur-tournées -> origin/ES-2287/DECOROOM---BDC-sur-tournées
* [new branch] ES-2437/AMP-Nouveau-filtre-emploi-assedic -> origin/ES-2437/AMP-Nouveau-filtre-emploi-assedic
f50580c16..72bc28c3e ES-2537/AUDIOLITE---Montant-prépa-forfait-modulable -> origin/ES-2537/AUDIOLITE---Montant-prépa-forfait-modulable
* [new branch] ES-2553-LIEN-HTTP-FEUILLEDEROUTE -> origin/ES-2553-LIEN-HTTP-FEUILLEDEROUTE
74e5371af..fb420623b ES-2563/NDF-montant-erronne-montant-demande -> origin/ES-2563/NDF-montant-erronne-montant-demande
ef5df135a..45ee027e4 ES-2569/ear-and-eyes-alertes-due -> origin/ES-2569/ear-and-eyes-alertes-due
* [new branch] ES-2596/SGPS-Nouvelle-carte-pro -> origin/ES-2596/SGPS-Nouvelle-carte-pro
cb4c4f9ad..34422f260 ES-2624/Problème-CP-hors-France -> origin/ES-2624/Problème-CP-hors-France
56330035f..f809b7623 ES-2655-ES-Gestion-de-l-usurpation-d-identite -> origin/ES-2655-ES-Gestion-de-l-usurpation-d-identite
7afc7a04c..37c900eae ES-2656/Export-NDF-section-analytique -> origin/ES-2656/Export-NDF-section-analytique
78b50d886..94b8861ff ES-2658/TKES0204B4-contenue-des-filtres-a-classer-par-ordre-alphabétique -> origin/ES-2658/TKES0204B4-contenue-des-filtres-a-classer-par-ordre-alphabétique
33e7f865e..797cc570d ES-2666-BTKES2803B1-des-document-en-attentes-ne-sont-pas-present-dans-le-tableau-de-bord -> origin/ES-2666-BTKES2803B1-des-document-en-attentes-ne-sont-pas-present-dans-le-tableau-de-bord
* [new branch] ES-2667/mes-équipes-favoris-problemes-de-visibilite -> origin/ES-2667/mes-équipes-favoris-problemes-de-visibilite
* [new branch] ES-2668-Probleme-avec-contacts-dans-le-carnet-d-adresse -> origin/ES-2668-Probleme-avec-contacts-dans-le-carnet-d-adresse
* [new branch] ES-2672/REFLEX-Devis-introuvable -> origin/ES-2672/REFLEX-Devis-introuvable
079172968..3eee985c6 develop -> origin/develop
f7e93d03e..b93fbf514 master -> origin/master
* [new tag] 1049 -> 1049
* [new tag] 1047 -> 1047
* [new tag] 1048 -> 1048
Exécution de la commande : cd /var/www/html/1579-8.4 && git fetch --all && git reset --hard origin/$(git rev-parse --abbrev-ref HEAD) && git pull
Fetching origin
HEAD is now at dd124bb7a ES-2576 Fix
Already up to date.
From github.com:Intrapole/EventSoft
aa621df82..dd124bb7a ES-2576/TKES2703B1---pb-avec-le-planning-mobile-les-sous-traitant-ne-voient-qu'un-prestation-par-jour -> origin/ES-2576/TKES2703B1---pb-avec-le-planning-mobile-les-sous-traitant-ne-voient-qu'un-prestation-par-jour
56293ae4e..0e0cc3442 DT-14-Nouveau-systeme-settings -> origin/DT-14-Nouveau-systeme-settings
* [new branch] ES-104/ES-Duplication-d’un-article -> origin/ES-104/ES-Duplication-d’un-article
* [new branch] ES-1118/GROUPE-F-Ajout-les-devises-dans-NDF -> origin/ES-1118/GROUPE-F-Ajout-les-devises-dans-NDF
* [new branch] ES-156/GL-EVENTS-Actif/inactif-sur-le-planning-véhicule/attribution -> origin/ES-156/GL-EVENTS-Actif/inactif-sur-le-planning-véhicule/attribution
5af777cbe..d92701d88 ES-1588-GL-EVENTS-Gestion-des-transports-V3-1-PARTIE-1 -> origin/ES-1588-GL-EVENTS-Gestion-des-transports-V3-1-PARTIE-1
2eb4101f9..8cd0d8978 ES-1588-GL-EVENTS-Gestion-des-transports-V3-1-PARTIE-1-VINCENT -> origin/ES-1588-GL-EVENTS-Gestion-des-transports-V3-1-PARTIE-1-VINCENT
* [new branch] ES-2053/ES-Base-lieux-à-partir-des-courses -> origin/ES-2053/ES-Base-lieux-à-partir-des-courses
* [new branch] ES-2059/ALIVE-Courses-&-Tournées-Droits-de-visualisation-documents -> origin/ES-2059/ALIVE-Courses-&-Tournées-Droits-de-visualisation-documents
* [new branch] ES-2074/EVENT-LOGISTIC---Ajout-des-pauses-depuis-Locasyst -> origin/ES-2074/EVENT-LOGISTIC---Ajout-des-pauses-depuis-Locasyst
* [new branch] ES-2223/NOVELTY-Ajout-de-modèle-de-message-envoi-de-BDC -> origin/ES-2223/NOVELTY-Ajout-de-modèle-de-message-envoi-de-BDC
* [new branch] ES-2344/dushow-creation-matricule-retour-modification -> origin/ES-2344/dushow-creation-matricule-retour-modification
* [new branch] ES-2354/GROUPE-F-Amélioration-export-des-ressources-sur-presta -> origin/ES-2354/GROUPE-F-Amélioration-export-des-ressources-sur-presta
58b324dab..22e73b7d5 ES-2370/edition-précontrat-date-forcee -> origin/ES-2370/edition-précontrat-date-forcee
* [new branch] ES-2410/NOVELTY-Modifications-de-statut-dans-les-pages-MB-par-opération -> origin/ES-2410/NOVELTY-Modifications-de-statut-dans-les-pages-MB-par-opération
8094b3165..27e407d83 ES-2510-AMP-Specifications-export-unites -> origin/ES-2510-AMP-Specifications-export-unites
* [new branch] ES-2540/Relancer-extraction-des-BDCs-chez-novelty-mois-par-mois -> origin/ES-2540/Relancer-extraction-des-BDCs-chez-novelty-mois-par-mois
* [new branch] ES-2544/VIDELIO-Export-presta/salariés -> origin/ES-2544/VIDELIO-Export-presta/salariés
c09148a5e..04174ca1a ES-2553-LIEN-HTTP-FEUILLEDEROUTE -> origin/ES-2553-LIEN-HTTP-FEUILLEDEROUTE
* [new branch] ES-2561/affichage-salaires-datatable -> origin/ES-2561/affichage-salaires-datatable
* [new branch] ES-2564/Groupe-F-BDC-soustraitantmass -> origin/ES-2564/Groupe-F-BDC-soustraitantmass
* [new branch] ES-2579/gl-amelioration-sstraitance -> origin/ES-2579/gl-amelioration-sstraitance
* [new branch] ES-2603/ZEBULON-Devis/Factures-Notes-spécifiques -> origin/ES-2603/ZEBULON-Devis/Factures-Notes-spécifiques
6c0648694..87d9cb1fb ES-2617/AVISO-Quelques-améliorations-à-apporter-dans-l'onglet-Salaires-des-prestations -> origin/ES-2617/AVISO-Quelques-améliorations-à-apporter-dans-l'onglet-Salaires-des-prestations
* [new branch] ES-2662/IMPACT-Export-fiche-prestation -> origin/ES-2662/IMPACT-Export-fiche-prestation
* [new branch] ES-2674/ALIVE-Planning-Filtre-chance-devis -> origin/ES-2674/ALIVE-Planning-Filtre-chance-devis
* [new branch] ES-2684-TKES2204B4-pb-avec-le-tableau-de-bord-des-PPSPS -> origin/ES-2684-TKES2204B4-pb-avec-le-tableau-de-bord-des-PPSPS
* [new branch] ES-2686-Reflex-devis-facture--bug-sur-modification-de-quantité-d'agents -> origin/ES-2686-Reflex-devis-facture--bug-sur-modification-de-quantité-d'agents
* [new branch] ES-2689-Demande-boutique-disparition-des-articles-dans-les-demandes -> origin/ES-2689-Demande-boutique-disparition-des-articles-dans-les-demandes
* [new branch] ES-2696/Temps-de-travail-comptabilisé-dans-les-salaires-pour-phases-de-voyage -> origin/ES-2696/Temps-de-travail-comptabilisé-dans-les-salaires-pour-phases-de-voyage
* [new branch] ES-2698/GROUPE-F-Rajout-mot-clé-contrat -> origin/ES-2698/GROUPE-F-Rajout-mot-clé-contrat
* [new branch] ES-2700/STROBOTECH-Passerelle-Locasyst-Nouvelle-donnée-à-récupérer -> origin/ES-2700/STROBOTECH-Passerelle-Locasyst-Nouvelle-donnée-à-récupérer
* [new branch] ES-2701/STROBOTECH-Passerelle-Locasyst-Heures-par-défaut -> origin/ES-2701/STROBOTECH-Passerelle-Locasyst-Heures-par-défaut
* [new branch] ES-2703/NDF-eventsoft -> origin/ES-2703/NDF-eventsoft
* [new branch] ES-2706/SGPS---Nouvelle-carte-pro-Modifications -> origin/ES-2706/SGPS---Nouvelle-carte-pro-Modifications
* [new branch] ES-2715/GROUPE-F-Fiche-Personnel-Affichage-sous-traitant -> origin/ES-2715/GROUPE-F-Fiche-Personnel-Affichage-sous-traitant
* [new branch] ES-2722-TKES2904B2-probleme-de-mise-en-page-lors-de-l-impression-des-formulaires -> origin/ES-2722-TKES2904B2-probleme-de-mise-en-page-lors-de-l-impression-des-formulaires
* [new branch] ES-2723-GL-Events-probleme-avec-le-calcul-du-poids-total-des-sous-traitant -> origin/ES-2723-GL-Events-probleme-avec-le-calcul-du-poids-total-des-sous-traitant
* [new branch] ES-2726-pb-avec-les-horaire-de-course-sur-le-planning-plasma -> origin/ES-2726-pb-avec-les-horaire-de-course-sur-le-planning-plasma
* [new branch] ES-2729-STAND-UP---Alertes-DUE-en-retard -> origin/ES-2729-STAND-UP---Alertes-DUE-en-retard
* [new branch] ES-2730/Bivouac-correction-sur-affichage-formulaire-de-prestation -> origin/ES-2730/Bivouac-correction-sur-affichage-formulaire-de-prestation
* [new branch] ES-2731/Planning-général--Filtre-chargé-d'affaires-qui-ne-fonctionne-pas-sur-le-cloud -> origin/ES-2731/Planning-général--Filtre-chargé-d'affaires-qui-ne-fonctionne-pas-sur-le-cloud
* [new branch] ES-2733/AVISO-3-améliorations-à-apporter-sur-le-filtre-de-recherche -> origin/ES-2733/AVISO-3-améliorations-à-apporter-sur-le-filtre-de-recherche
* [new branch] ES-2734/mise-en-pages-contrats -> origin/ES-2734/mise-en-pages-contrats
* [new branch] ES-2735/Lors-du-glisser-/déposer-d'indispo-sur-le-planning-personnel-attrib -> origin/ES-2735/Lors-du-glisser-/déposer-d'indispo-sur-le-planning-personnel-attrib
* [new branch] ES-2736/AVISO---3-améliorations-à-apporter-sur-le-filtre-de-recherche -> origin/ES-2736/AVISO---3-améliorations-à-apporter-sur-le-filtre-de-recherche
* [new branch] ES-2738/VIDELIO-Changement-filtre-NDF-Mobile -> origin/ES-2738/VIDELIO-Changement-filtre-NDF-Mobile
* [new branch] ES-2740/decalage-impression-du-planning-veh-attribution -> origin/ES-2740/decalage-impression-du-planning-veh-attribution
* [new branch] ES-2741/Export-NDF-section-analytique -> origin/ES-2741/Export-NDF-section-analytique
* [new branch] ES-2743-TKES2404B2-mise-en-prod-du-script-de-relance-des-sous-traitants -> origin/ES-2743-TKES2404B2-mise-en-prod-du-script-de-relance-des-sous-traitants
* [new branch] ES-2746/Ajout-droit-pour-ajout-suppression-organigramme -> origin/ES-2746/Ajout-droit-pour-ajout-suppression-organigramme
* [new branch] ES-91/Iris-Even-planning-prestafiltre-typepresta -> origin/ES-91/Iris-Even-planning-prestafiltre-typepresta
06b6ca8c8..73bbde970 ajouts-api -> origin/ajouts-api
3eee985c6..140af1117 develop -> origin/develop
b93fbf514..5f9cb3eba master -> origin/master
* [new branch] retrocompatibilite-signin-api -> origin/retrocompatibilite-signin-api
* [new tag] 1067 -> 1067
* [new tag] 1050 -> 1050
* [new tag] 1051 -> 1051
* [new tag] 1052 -> 1052
* [new tag] 1053 -> 1053
* [new tag] 1054 -> 1054
* [new tag] 1055 -> 1055
* [new tag] 1056 -> 1056
* [new tag] 1057 -> 1057
* [new tag] 1058 -> 1058
* [new tag] 1059 -> 1059
* [new tag] 1060 -> 1060
* [new tag] 1061 -> 1061
* [new tag] 1062 -> 1062
* [new tag] 1063 -> 1063
* [new tag] 1064 -> 1064
* [new tag] 1065 -> 1065
* [new tag] 1066 -> 1066
Exécution de la commande : cd /var/www/html/1579-8.4 && git fetch --all && git reset --hard origin/$(git rev-parse --abbrev-ref HEAD) && git pull
Fetching origin
HEAD is now at 5426a79e2 ES-2576 Fix
Already up to date.
From github.com:Intrapole/EventSoft
dd124bb7a..5426a79e2 ES-2576/TKES2703B1---pb-avec-le-planning-mobile-les-sous-traitant-ne-voient-qu'un-prestation-par-jour -> origin/ES-2576/TKES2703B1---pb-avec-le-planning-mobile-les-sous-traitant-ne-voient-qu'un-prestation-par-jour
d92701d88..2f816a1ea ES-1588-GL-EVENTS-Gestion-des-transports-V3-1-PARTIE-1 -> origin/ES-1588-GL-EVENTS-Gestion-des-transports-V3-1-PARTIE-1
* [new branch] ES-2554/DECOROOM-Besoin-email-urgence-chauffeur -> origin/ES-2554/DECOROOM-Besoin-email-urgence-chauffeur
c35a3ab2c..200039660 ES-2686-Reflex-devis-facture--bug-sur-modification-de-quantité-d'agents -> origin/ES-2686-Reflex-devis-facture--bug-sur-modification-de-quantité-d'agents
75dbaa78d..61586f63f ES-2730/Bivouac-correction-sur-affichage-formulaire-de-prestation -> origin/ES-2730/Bivouac-correction-sur-affichage-formulaire-de-prestation
e7ead0aa5..d1b88fb0d ES-2734/mise-en-pages-contrats -> origin/ES-2734/mise-en-pages-contrats
6e1417d3a..60532e404 ES-2743-TKES2404B2-mise-en-prod-du-script-de-relance-des-sous-traitants -> origin/ES-2743-TKES2404B2-mise-en-prod-du-script-de-relance-des-sous-traitants
3248232a5..6baeaa384 ES-2746/Ajout-droit-pour-ajout-suppression-organigramme -> origin/ES-2746/Ajout-droit-pour-ajout-suppression-organigramme
* [new branch] ES-2748/MOMENSE---Problème-bouton-sur-le-planning -> origin/ES-2748/MOMENSE---Problème-bouton-sur-le-planning
140af1117..4d08b4c2d develop -> origin/develop
Exécution de la commande : cd /var/www/html/1579-8.4 && git fetch --all && git reset --hard origin/$(git rev-parse --abbrev-ref HEAD) && git pull
Fetching origin
HEAD is now at 1611ac620 ES-2576
Already up to date.
From github.com:Intrapole/EventSoft
5426a79e2..1611ac620 ES-2576/TKES2703B1---pb-avec-le-planning-mobile-les-sous-traitant-ne-voient-qu'un-prestation-par-jour -> origin/ES-2576/TKES2703B1---pb-avec-le-planning-mobile-les-sous-traitant-ne-voient-qu'un-prestation-par-jour
2f816a1ea..8b0545744 ES-1588-GL-EVENTS-Gestion-des-transports-V3-1-PARTIE-1 -> origin/ES-1588-GL-EVENTS-Gestion-des-transports-V3-1-PARTIE-1
72c17b5c7..cc0e7edf7 ES-2059/ALIVE-Courses-&-Tournées-Droits-de-visualisation-documents -> origin/ES-2059/ALIVE-Courses-&-Tournées-Droits-de-visualisation-documents
* [new branch] ES-2093/CITE-DE-NANTES---Affichage-des-compteurs-sur-planning-pers/attrib -> origin/ES-2093/CITE-DE-NANTES---Affichage-des-compteurs-sur-planning-pers/attrib
258d6299e..6426356a8 ES-2223/NOVELTY-Ajout-de-modèle-de-message-envoi-de-BDC -> origin/ES-2223/NOVELTY-Ajout-de-modèle-de-message-envoi-de-BDC
27e407d83..d7c401fb3 ES-2510-AMP-Specifications-export-unites -> origin/ES-2510-AMP-Specifications-export-unites
4a143a3f4..6c3a94fa6 ES-2544/VIDELIO-Export-presta/salariés -> origin/ES-2544/VIDELIO-Export-presta/salariés
dc5fcaa4e..f38a76910 ES-2703/NDF-eventsoft -> origin/ES-2703/NDF-eventsoft
1316c944d..4242c9e19 ES-2715/GROUPE-F-Fiche-Personnel-Affichage-sous-traitant -> origin/ES-2715/GROUPE-F-Fiche-Personnel-Affichage-sous-traitant
d1b88fb0d..13cd0a1b0 ES-2734/mise-en-pages-contrats -> origin/ES-2734/mise-en-pages-contrats
* [new branch] ES-2755/pb-de-visibilité-des-ressources -> origin/ES-2755/pb-de-visibilité-des-ressources
* [new branch] ES-2762/NDF-OUVERTURE-JUSTIFICATIF -> origin/ES-2762/NDF-OUVERTURE-JUSTIFICATIF
73bbde970..1ea726ca5 ajouts-api -> origin/ajouts-api
4d08b4c2d..4997a014d develop -> origin/develop
* [new branch] implem-heic-to-jpg -> origin/implem-heic-to-jpg
5f9cb3eba..239d7ce83 master -> origin/master
* [new tag] 1070 -> 1070
* [new tag] 1068 -> 1068
* [new tag] 1069 -> 1069
Exécution de la commande : cd /var/www/html/1579-8.4 && git fetch --all && git reset --hard origin/$(git rev-parse --abbrev-ref HEAD) && git pull
Fetching origin
HEAD is now at 1611ac620 ES-2576
Already up to date.
From github.com:Intrapole/EventSoft
8b0545744..4d2eb995a ES-1588-GL-EVENTS-Gestion-des-transports-V3-1-PARTIE-1 -> origin/ES-1588-GL-EVENTS-Gestion-des-transports-V3-1-PARTIE-1
* [new branch] ES-2398/AMP---Planification-personnel/attribution -> origin/ES-2398/AMP---Planification-personnel/attribution
* [new branch] ES-2529/LENI---Feuille-de-route---Joindre-documents-de-frais-annexes -> origin/ES-2529/LENI---Feuille-de-route---Joindre-documents-de-frais-annexes
271011454..4a3db5007 ES-2564/Groupe-F-BDC-soustraitantmass -> origin/ES-2564/Groupe-F-BDC-soustraitantmass
bd252206a..09b922098 ES-2696/Temps-de-travail-comptabilisé-dans-les-salaires-pour-phases-de-voyage -> origin/ES-2696/Temps-de-travail-comptabilisé-dans-les-salaires-pour-phases-de-voyage
f38a76910..007a5e8f1 ES-2703/NDF-eventsoft -> origin/ES-2703/NDF-eventsoft
* [new branch] ES-2705/GL-Ajout-filtre-dans-les-tâches-sur-prestation -> origin/ES-2705/GL-Ajout-filtre-dans-les-tâches-sur-prestation
28a20fbfa..72ddb2ff4 ES-2735/Lors-du-glisser-/déposer-d'indispo-sur-le-planning-personnel-attrib -> origin/ES-2735/Lors-du-glisser-/déposer-d'indispo-sur-le-planning-personnel-attrib
bfdd8b8b3..c875001ee ES-2748/MOMENSE---Problème-bouton-sur-le-planning -> origin/ES-2748/MOMENSE---Problème-bouton-sur-le-planning
* [new branch] ES-2765/Devis-Facture-plus-de-lien-lorsque-le-devis-est-créé-(sur-l'onglet-de-la-prestation -> origin/ES-2765/Devis-Facture-plus-de-lien-lorsque-le-devis-est-créé-(sur-l'onglet-de-la-prestation
* [new branch] ES-2766/sentry-eventsoft-128 -> origin/ES-2766/sentry-eventsoft-128
* [new branch] ES-2767/Modif-bon-de-commande -> origin/ES-2767/Modif-bon-de-commande
* [new branch] ES-2768/ordre-des-statuts-de-plannif-sur-tournée -> origin/ES-2768/ordre-des-statuts-de-plannif-sur-tournée
* [new branch] ES-2769/Bug-sur-les-congés-spectacles -> origin/ES-2769/Bug-sur-les-congés-spectacles
* [new branch] ES-2770/TKES1905B1-pb-avec-la-fonction-prevenir-les-signataire -> origin/ES-2770/TKES1905B1-pb-avec-la-fonction-prevenir-les-signataire
* [new branch] ES-2771-ZEBULON---Mauvais-calcul-export -> origin/ES-2771-ZEBULON---Mauvais-calcul-export
d3bc04448..71287c286 ES-91/Iris-Even-planning-prestafiltre-typepresta -> origin/ES-91/Iris-Even-planning-prestafiltre-typepresta
4997a014d..3be10c925 develop -> origin/develop
239d7ce83..e1f2cc1e6 master -> origin/master
* [new tag] 1071 -> 1071
Exécution de la commande : cd /var/www/html/1579-8.4 && git fetch --all && git reset --hard origin/$(git rev-parse --abbrev-ref HEAD) && git pull
Fetching origin
HEAD is now at 047b0a264 Merge branch 'develop' into ES-2576/TKES2703B1---pb-avec-le-planning-mobile-les-sous-traitant-ne-voient-qu'un-prestation-par-jour
Already up to date.
From github.com:Intrapole/EventSoft
1611ac620..047b0a264 ES-2576/TKES2703B1---pb-avec-le-planning-mobile-les-sous-traitant-ne-voient-qu'un-prestation-par-jour -> origin/ES-2576/TKES2703B1---pb-avec-le-planning-mobile-les-sous-traitant-ne-voient-qu'un-prestation-par-jour
4d2eb995a..1aceba106 ES-1588-GL-EVENTS-Gestion-des-transports-V3-1-PARTIE-1 -> origin/ES-1588-GL-EVENTS-Gestion-des-transports-V3-1-PARTIE-1
cc0e7edf7..1acdbdc26 ES-2059/ALIVE-Courses-&-Tournées-Droits-de-visualisation-documents -> origin/ES-2059/ALIVE-Courses-&-Tournées-Droits-de-visualisation-documents
* [new branch] ES-2085/DUSHOW-NOVELTY-FRANCE-Traduction-Bon-de-livraison-sur-intra-me -> origin/ES-2085/DUSHOW-NOVELTY-FRANCE-Traduction-Bon-de-livraison-sur-intra-me
f0b34d15b..2e2d606b1 ES-2093/CITE-DE-NANTES---Affichage-des-compteurs-sur-planning-pers/attrib -> origin/ES-2093/CITE-DE-NANTES---Affichage-des-compteurs-sur-planning-pers/attrib
* [new branch] ES-2337/REMOTE---Ajout-de-matériel-sur-une-tournée -> origin/ES-2337/REMOTE---Ajout-de-matériel-sur-une-tournée
ce241e8e5..9d549b070 ES-2398/AMP---Planification-personnel/attribution -> origin/ES-2398/AMP---Planification-personnel/attribution
d7c401fb3..2af79903a ES-2510-AMP-Specifications-export-unites -> origin/ES-2510-AMP-Specifications-export-unites
* [new branch] ES-2523/VIASTORIA-Accès-au-planning-personnel-attribution -> origin/ES-2523/VIASTORIA-Accès-au-planning-personnel-attribution
8520f29a8..3c7b3a36d ES-2540/Relancer-extraction-des-BDCs-chez-novelty-mois-par-mois -> origin/ES-2540/Relancer-extraction-des-BDCs-chez-novelty-mois-par-mois
6c3a94fa6..10ad9d8b3 ES-2544/VIDELIO-Export-presta/salariés -> origin/ES-2544/VIDELIO-Export-presta/salariés
4a3db5007..634a9f0fb ES-2564/Groupe-F-BDC-soustraitantmass -> origin/ES-2564/Groupe-F-BDC-soustraitantmass
1ee8dcd66..6c47c430d ES-2705/GL-Ajout-filtre-dans-les-tâches-sur-prestation -> origin/ES-2705/GL-Ajout-filtre-dans-les-tâches-sur-prestation
13cd0a1b0..9d520c4ab ES-2734/mise-en-pages-contrats -> origin/ES-2734/mise-en-pages-contrats
* [new branch] ES-2759/TKES1505B1---l'utilisation-d'un-salarié-rataché-d'un-sous-traitant-n'ajoute-pas-le-sous-traitant-dans-le-PPSPS -> origin/ES-2759/TKES1505B1---l'utilisation-d'un-salarié-rataché-d'un-sous-traitant-n'ajoute-pas-le-sous-traitant-dans-le-PPSPS
* [new branch] ES-2773-ZEBULON---Mauvais-calcul-salaire-suite -> origin/ES-2773-ZEBULON---Mauvais-calcul-salaire-suite
* [new branch] ES-2775/planning-personnel-attribution-comportement-calage -> origin/ES-2775/planning-personnel-attribution-comportement-calage
* [new branch] ES-2780/phase-de-chargement-jour-de-la-tournee-pas-sur-date-de-chargement -> origin/ES-2780/phase-de-chargement-jour-de-la-tournee-pas-sur-date-de-chargement
* [new branch] ES-2781/Bug-sur-la-version-mobile -> origin/ES-2781/Bug-sur-la-version-mobile
71287c286..c177db34b ES-91/Iris-Even-planning-prestafiltre-typepresta -> origin/ES-91/Iris-Even-planning-prestafiltre-typepresta
3be10c925..4bbb22a4c develop -> origin/develop
e1f2cc1e6..8ee08f327 master -> origin/master
* [new tag] 1073 -> 1073
* [new tag] 1072 -> 1072
Exécution de la commande : cd /var/www/html/1579-8.4 && git fetch --all && git reset --hard origin/$(git rev-parse --abbrev-ref HEAD) && git pull
Fetching origin
HEAD is now at 047b0a264 Merge branch 'develop' into ES-2576/TKES2703B1---pb-avec-le-planning-mobile-les-sous-traitant-ne-voient-qu'un-prestation-par-jour
Already up to date.
Exécution de la commande : cd /var/www/html/1579-8.4 && git fetch --all && git reset --hard origin/$(git rev-parse --abbrev-ref HEAD) && git pull
Fetching origin
HEAD is now at 360655c95 ES-2759
Already up to date.
From github.com:Intrapole/EventSoft
047b0a264..360655c95 ES-2576/TKES2703B1---pb-avec-le-planning-mobile-les-sous-traitant-ne-voient-qu'un-prestation-par-jour -> origin/ES-2576/TKES2703B1---pb-avec-le-planning-mobile-les-sous-traitant-ne-voient-qu'un-prestation-par-jour
Exécution de la commande : cd /var/www/html/1579-8.4 && git fetch --all && git reset --hard origin/$(git rev-parse --abbrev-ref HEAD) && git pull
Fetching origin
HEAD is now at 360655c95 ES-2759
Already up to date.
From github.com:Intrapole/EventSoft
1aceba106..aec951eaf ES-1588-GL-EVENTS-Gestion-des-transports-V3-1-PARTIE-1 -> origin/ES-1588-GL-EVENTS-Gestion-des-transports-V3-1-PARTIE-1
* [new branch] ES-1779-/-GL-EVENTS-Modification-CDC-PRA/PCA-V3 -> origin/ES-1779-/-GL-EVENTS-Modification-CDC-PRA/PCA-V3
* [new branch] ES-1780/TKES0409B2-ajout-de-champs-dans-la-vue-eventsoft_v_contrat -> origin/ES-1780/TKES0409B2-ajout-de-champs-dans-la-vue-eventsoft_v_contrat
decdd0831..0c6a7cf8a ES-2074/EVENT-LOGISTIC---Ajout-des-pauses-depuis-Locasyst -> origin/ES-2074/EVENT-LOGISTIC---Ajout-des-pauses-depuis-Locasyst
* [new branch] ES-2256/IMPACT-Export-ressources -> origin/ES-2256/IMPACT-Export-ressources
* [new branch] ES-2382-GL-EVENTS-Export-du-personnel-global-en-csv -> origin/ES-2382-GL-EVENTS-Export-du-personnel-global-en-csv
2af79903a..657366481 ES-2510-AMP-Specifications-export-unites -> origin/ES-2510-AMP-Specifications-export-unites
* [new branch] ES-2530/GL-EVENTS-Formulaire-Affichage-date-du-jour -> origin/ES-2530/GL-EVENTS-Formulaire-Affichage-date-du-jour
* [new branch] ES-2538/GL-EVENT-Création-d'une-catégorie-de-droit-DAST -> origin/ES-2538/GL-EVENT-Création-d'une-catégorie-de-droit-DAST
10ad9d8b3..117033c90 ES-2544/VIDELIO-Export-presta/salariés -> origin/ES-2544/VIDELIO-Export-presta/salariés
* [new branch] ES-2583-CRIT-VILLEPINTE-Amelioration-planning-pers-attrib -> origin/ES-2583-CRIT-VILLEPINTE-Amelioration-planning-pers-attrib
6c47c430d..b45a4e2bb ES-2705/GL-Ajout-filtre-dans-les-tâches-sur-prestation -> origin/ES-2705/GL-Ajout-filtre-dans-les-tâches-sur-prestation
9d520c4ab..1e3178b7c ES-2734/mise-en-pages-contrats -> origin/ES-2734/mise-en-pages-contrats
c875001ee..98d01e493 ES-2748/MOMENSE---Problème-bouton-sur-le-planning -> origin/ES-2748/MOMENSE---Problème-bouton-sur-le-planning
* [new branch] ES-2749/ARTO---Ajout-d'un-nouveau-statut-de-planification -> origin/ES-2749/ARTO---Ajout-d'un-nouveau-statut-de-planification
177921bb6..8b89e6916 ES-2773-ZEBULON---Mauvais-calcul-salaire-suite -> origin/ES-2773-ZEBULON---Mauvais-calcul-salaire-suite
* [new branch] ES-2774/MATCH-Changement-calcul-NDF -> origin/ES-2774/MATCH-Changement-calcul-NDF
* [new branch] ES-2788/TKES1305B1-visibilité-non-geree-ajout-indisponibilite -> origin/ES-2788/TKES1305B1-visibilité-non-geree-ajout-indisponibilite
* [new branch] ES-2791-COVER-EVENT--Modification -> origin/ES-2791-COVER-EVENT--Modification
* [new branch] ES-2792/REFLEX-Souci-majorations-de-nuit -> origin/ES-2792/REFLEX-Souci-majorations-de-nuit
* [new branch] ES-2793/TKES2005B1-pb-affichage-qualification-creation-phase-planning-personnel-attrib -> origin/ES-2793/TKES2005B1-pb-affichage-qualification-creation-phase-planning-personnel-attrib
* [new branch] ES-2796/AUDIOVISIUEL-locasyst-ne-pas-importer-notes-de-transport -> origin/ES-2796/AUDIOVISIUEL-locasyst-ne-pas-importer-notes-de-transport
* [new branch] ES-2799/FIX-SENTRY -> origin/ES-2799/FIX-SENTRY
* [new branch] ES-2802/probleme-affichage-des-devis-annexes -> origin/ES-2802/probleme-affichage-des-devis-annexes
* [new branch] ES-2805/Personnel -> origin/ES-2805/Personnel
* [new branch] ES-2806/TKES2705B1-le-planning-vehicule-affiche-rien-si-affichage-course -> origin/ES-2806/TKES2705B1-le-planning-vehicule-affiche-rien-si-affichage-course
* [new branch] ES-2807/CRIT-PRESTIGE-URGENT-ANOMALIE-RECURRENTE-SUR-VOS-DISPONIBILITES-LA-SEMAINE-PROCHAINE-22 -> origin/ES-2807/CRIT-PRESTIGE-URGENT-ANOMALIE-RECURRENTE-SUR-VOS-DISPONIBILITES-LA-SEMAINE-PROCHAINE-22
1ea726ca5..29bd94654 ajouts-api -> origin/ajouts-api
4bbb22a4c..74d3061cc develop -> origin/develop
8ee08f327..3f5933947 master -> origin/master
* [new tag] 1076 -> 1076
* [new tag] 1074 -> 1074
* [new tag] 1075 -> 1075
Exécution de la commande : mysql -h mysql -uroot -proot -e 'DROP DATABASE `1579-8.4`'
mysql: [Warning] Using a password on the command line interface can be insecure.
Exécution de la commande : rm -R 1579-8.4