Commit Graph

153 Commits

Author SHA1 Message Date
00a55a9e67 Merge branch 'master' into dist/eole/2.7.2/master pkg/stable/eole-2.7.2/2.0.19 2021-03-08 10:26:07 +01:00
7ebdf9ba53 Correction Problème au niveau des astreintes #65 2021-03-08 10:23:23 +01:00
349f5c26e7 Merge branch 'master' into dist/eole/2.7.2/master pkg/stable/eole-2.7.2/2.0.18 2021-03-05 14:29:21 +01:00
01f56289b4 update route app_event_load parameter 2021-03-05 14:19:57 +01:00
18d993f307 Merge branch 'master' into dist/eole/2.7.2/master pkg/stable/eole-2.7.2/2.0.17 2021-03-05 10:24:51 +01:00
94fa9d1f0b switch task inactives ref #61 2021-03-04 10:17:13 +01:00
5343d61401 correction mise en page rapport pdf ref #58 2021-03-04 09:26:18 +01:00
6bd189271f correction fermeture div dans rapport ref #57 2021-03-04 09:18:17 +01:00
f8b4d0446d Merge branch 'master' into dist/eole/2.7.2/master pkg/stable/eole-2.7.2/2.0.16 2021-03-03 16:16:59 +01:00
ce10df9293 Correction affichage calendrier sélectionné ref #60 2021-03-03 16:10:48 +01:00
b14fc3d0e1 Merge branch 'master' into dist/eole/2.7.2/master pkg/stable/eole-2.7.2/2.0.15 2021-03-03 14:55:03 +01:00
164da2ee48 correction on planing 2021-03-03 14:51:22 +01:00
1fec858f01 suppression trace de debug 2021-02-04 17:05:39 +01:00
697c7a8f1c Merge branch 'dist/eole/2.7.2/master' of https://forge.cadoles.com/Cadoles/schedule into dist/eole/2.7.2/master pkg/stable/eole-2.7.2/2.0.14 2021-02-04 16:17:23 +01:00
24ecd6c87e Merge branch 'master' into dist/eole/2.7.2/master 2021-02-04 16:17:18 +01:00
6acf427696 correctif sur autosubmit des users 2021-02-04 16:13:35 +01:00
b17024cccd Merge branch 'master' into dist/eole/2.7.2/master pkg/stable/eole-2.7.2/0.2.0 pkg/stable/eole-2.7.2/2.0.10 pkg/stable/eole-2.7.2/2.0.11 pkg/stable/eole-2.7.2/2.0.12 pkg/stable/eole-2.7.2/2.0.13 2021-01-28 12:15:43 +01:00
cdb2537d3f update migration script 2020-12-17 11:04:01 +01:00
2ba143e5a2 Ajout notion de tâche active, et affichage uniquement des taches active lors de la création d'événements #55 2020-12-17 10:53:52 +01:00
5037b0945e ajout export jours facturés #56 2020-12-16 16:40:15 +01:00
a0b87b907f Merge branch 'master' into dist/eole/2.7.2/master pkg/stable/eole-2.7.2/2.0.9 2020-11-13 10:20:38 +01:00
c31d14bff4 mise à niveau des fichiers d'environnement 2020-11-13 10:20:05 +01:00
dfa5a993ce Merge branch 'master' into dist/eole/2.7.2/master pkg/stable/eole-2.7.2/2.0.8 2020-11-13 09:30:06 +01:00
91536ed930 update dico description 2020-11-06 15:25:29 +01:00
10cb25730b Merge branch 'api_dolibarr' of Cadoles/schedule into master 2020-11-03 09:55:46 +01:00
0e159604e6 maj condition affichage dolibarr 2020-11-03 09:53:53 +01:00
62e7339057 ajout variable pour activer dolibarr 2020-11-03 09:53:53 +01:00
5ea06c9aec set template for link orders 2020-11-03 09:53:53 +01:00
bb7e66f0c9 Add link on dolibarr on convertion 2020-11-03 09:53:53 +01:00
e5863fdd0a set template 2020-11-03 09:53:53 +01:00
1691620986 first implementation of dolibarr api 2020-11-03 09:53:53 +01:00
bceee0582e add template configuration 2020-11-03 09:53:16 +01:00
5b62397a23 remove debugs 2020-10-15 10:23:58 +02:00
f86972fe7d modification taille box sur les stats 2020-10-14 16:51:26 +02:00
37095a4aac nettoyage des natures 2020-10-14 16:13:58 +02:00
4e407397f2 stat cadoles 2020-10-14 16:08:53 +02:00
702d471c1a max y pour les graph 2020-10-14 14:11:44 +02:00
1d7ad9bfc0 mise en place de stats 2020-10-14 12:01:28 +02:00
a6acd26a5c Ne pas afficher le cumul des congés sur le calendrier ref #52 2020-10-14 10:16:00 +02:00
e47bf32cc6 Correction cumul par tache dans les rapports ref: #54 2020-10-14 10:06:40 +02:00
398e803b1a récupération du bon utilisateur lors de la validation des congés 2020-10-13 10:29:40 +02:00
364da8ae38 add container to notificationservice 2020-10-13 09:08:44 +02:00
2c281d5166 corrections on timer task form id 2020-10-13 09:08:20 +02:00
5dacb82378 update composer.json 2020-10-12 16:57:01 +02:00
64e3da238d Merge branch 'sentry' of Cadoles/schedule into master 2020-10-07 13:04:03 +02:00
7b0a263581 update .env for sentry 2020-10-07 13:02:05 +02:00
2cac8080ee ajout de sentry en composer #48 2020-10-07 11:35:39 +02:00
92ac88b39d typo 2020-10-06 16:27:15 +02:00
354e2186c8 Ajout export commandes 2020-10-06 16:25:16 +02:00
6a92c43234 typo 2020-10-06 15:56:01 +02:00