From 11c6a6fa7ad70047efbfdfa5c4bb78c70801e1c5 Mon Sep 17 00:00:00 2001 From: korenstin Date: Mon, 24 Jun 2024 16:57:39 +0200 Subject: [PATCH 1/3] modifications permissions consommation pc kfet (Alcool) --- apps/note/templates/note/mails/negative_balance.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/note/templates/note/mails/negative_balance.html b/apps/note/templates/note/mails/negative_balance.html index 8c869a54..70af1f0f 100644 --- a/apps/note/templates/note/mails/negative_balance.html +++ b/apps/note/templates/note/mails/negative_balance.html @@ -23,7 +23,7 @@

Par ailleurs, le BDE ne sert pas d'alcool aux adhérents dont le solde - est inférieur à 0 € depuis plus de 24h. + est inférieur à 0 €.

@@ -43,4 +43,4 @@ {% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %}

- \ No newline at end of file + From 32830e43fdf48f5a8d18b83e71d0b5d4829412b1 Mon Sep 17 00:00:00 2001 From: quark Date: Mon, 24 Jun 2024 21:21:22 +0200 Subject: [PATCH 2/3] Modify permission for negative --- apps/permission/fixtures/initial.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json index 92e7098b..64bf9ae3 100644 --- a/apps/permission/fixtures/initial.json +++ b/apps/permission/fixtures/initial.json @@ -2591,12 +2591,12 @@ "note", "transaction" ], - "query": "[\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}}, {\"valid\": false}]", + "query": "[\"OR\", {\"source__balance__gte\": 0}, [\"AND\", [\"NOT\", {\"recurrenttransaction__template__category__name\": \"Alcool\"}], {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}}], {\"valid\": false}]" "type": "add", "mask": 2, "field": "", "permanent": false, - "description": "Créer une transaction quelconque tant que la source reste au-dessus de -20 €" + "description": "Créer une transaction quelconque tant que la source reste positive s'il s'agit d'alcool, sinon au-dessus de -20€" } }, { From c912383f86399196db56c82af4ddc82efb8fd1b4 Mon Sep 17 00:00:00 2001 From: quark Date: Mon, 24 Jun 2024 22:36:22 +0200 Subject: [PATCH 3/3] =?UTF-8?q?oups=20la=20virgule=20oubli=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/permission/fixtures/initial.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json index 64bf9ae3..b59fdb61 100644 --- a/apps/permission/fixtures/initial.json +++ b/apps/permission/fixtures/initial.json @@ -2591,7 +2591,7 @@ "note", "transaction" ], - "query": "[\"OR\", {\"source__balance__gte\": 0}, [\"AND\", [\"NOT\", {\"recurrenttransaction__template__category__name\": \"Alcool\"}], {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}}], {\"valid\": false}]" + "query": "[\"OR\", {\"source__balance__gte\": 0}, [\"AND\", [\"NOT\", {\"recurrenttransaction__template__category__name\": \"Alcool\"}], {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}}], {\"valid\": false}]", "type": "add", "mask": 2, "field": "",