Commit Graph

181 Commits

Author SHA1 Message Date
140318ec3c Merge branch 'master' into dist/eole/2.7.2/master pkg/stable/eole-2.7.2/2.0.31 2023-05-16 17:23:10 +02:00
afornerot
43c1b6f5ce correction feriées sur synthèse (fix #82) 2023-05-16 17:20:38 +02:00
6bb1d90549 Merge branch 'master' into dist/eole/2.7.2/master pkg/stable/eole-2.7.2/2.0.28 pkg/stable/eole-2.7.2/2.0.29 pkg/stable/eole-2.7.2/2.0.30 2022-09-08 14:22:54 +02:00
afornerot
bfedc2f593 déblocage du max 1ETP par jour 2022-09-08 13:42:28 +02:00
afornerot
f1baf4d87e ne plus tenter de notifier (fixe #78) 2022-09-07 11:23:07 +02:00
6bba1d3529 Merge branch 'master' into dist/eole/2.7.2/master pkg/stable/eole-2.7.2/2.0.27 2022-03-14 14:21:08 +01:00
afornerot
57220794b9 prise en compte des breakday à posteriori 2022-03-14 11:51:07 +01:00
8afdd8c4d3 Merge branch 'master' into dist/eole/2.7.2/master pkg/stable/eole-2.7.2/2.0.26 2022-02-14 10:00:06 +01:00
afornerot
3edae845f0 mise en place d'un controleur REST 2022-02-14 09:59:14 +01:00
49dbeedaec Merge branch 'master' into dist/eole/2.7.2/master pkg/stable/eole-2.7.2/2.0.25 2021-11-23 15:22:40 +01:00
0ba36598fa ajout du l'activité et du domaine dans l'export (fixes #77) 2021-11-23 14:55:23 +01:00
0cae27c5b7 Merge branch 'master' into dist/eole/2.7.2/master pkg/stable/eole-2.7.2/2.0.23 pkg/stable/eole-2.7.2/2.0.24 2021-11-22 11:26:19 +01:00
02dc56c7c9 remettre la notion de jour validé hors schedule et ajout notion de frais (fixes #76) 2021-11-22 10:55:34 +01:00
cab4ee98f0 correctif asset dropzone 2021-06-28 09:52:18 +02:00
4654b7b7d4 budget synthèse 2021-06-17 14:06:08 +02:00
11026cc2cc Merge branch 'master' into dist/eole/2.7.2/master pkg/stable/eole-2.7.2/2.0.22 2021-06-16 10:35:56 +02:00
e1f48d462a replacer le fichier .env.model 2021-06-16 10:35:24 +02:00
2f531378ba Merge branch 'master' into dist/eole/2.7.2/master pkg/stable/eole-2.7.2/2.0.21 2021-06-15 09:19:32 +02:00
0b9bd0fed3 ajout du paquet apps dans le dico 2021-06-15 09:19:06 +02:00
1ef01fdbfe compilation asset 2021-06-15 08:57:39 +02:00
b12ed79946 mise en place des budgets 2021-06-07 15:05:20 +02:00
54dc485503 mise en place des budgets 2021-06-07 13:58:56 +02:00
1954c00b39 mise en place du cron + système de moulinette + init du domaine sur les projets existant 2021-06-02 14:59:41 +02:00
0f517ec402 Ajout de la notion de domaine (fixes #72) 2021-06-01 16:58:32 +02:00
83e330b318 evolution groupe de travail 2021-06-01 11:50:58 +02:00
ebe2a09c30 Merge branch 'master' into dist/eole/2.7.2/master pkg/stable/eole-2.7.2/2.0.20 2021-05-03 10:01:28 +02:00
a9c8825dfa prevent event display twice on addevent fix #67 2021-04-02 11:47:48 +02:00
4d379a6f76 order menu project list by customer name 2021-03-31 11:03:48 +02:00
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