diff --git a/apps/note/static/note/js/consos.js b/apps/note/static/note/js/consos.js index 5999ffc3..6f9dc61e 100644 --- a/apps/note/static/note/js/consos.js +++ b/apps/note/static/note/js/consos.js @@ -221,7 +221,7 @@ function consume (source, source_alias, dest, quantity, amount, reason, type, ca .done(function () { if (!isNaN(source.balance)) { const newBalance = source.balance - quantity * amount - if (newBalance <= -5000) { + if (newBalance <= -2000) { addMsg(interpolate(gettext('Warning, the transaction from the note %s succeed, ' + 'but the emitter note %s is very negative.'), [source_alias, source_alias]), 'danger', 30000) } else if (newBalance < 0) { diff --git a/apps/note/static/note/js/transfer.js b/apps/note/static/note/js/transfer.js index 6c1656ef..509d9b48 100644 --- a/apps/note/static/note/js/transfer.js +++ b/apps/note/static/note/js/transfer.js @@ -314,7 +314,7 @@ $('#btn_transfer').click(function () { if (!isNaN(source.note.balance)) { const newBalance = source.note.balance - source.quantity * dest.quantity * amount - if (newBalance <= -5000) { + if (newBalance <= -2000) { addMsg(interpolate(gettext('Warning, the transaction of %s from the note %s to the note %s succeed, but the emitter note %s is very negative.'), [pretty_money(source.quantity * dest.quantity * amount), source.name, dest.name, source.name]), 'danger', 10000) reset() diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json index 956d2b37..49f1fe91 100644 --- a/apps/permission/fixtures/initial.json +++ b/apps/permission/fixtures/initial.json @@ -319,7 +319,7 @@ "note", "transaction" ], - "query": "[\"AND\", [\"OR\", {\"source\": [\"club\", \"note\"]}, {\"destination\": [\"club\", \"note\"]}], [\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}}, {\"valid\": false}]]", + "query": "[\"AND\", [\"OR\", {\"source\": [\"club\", \"note\"]}, {\"destination\": [\"club\", \"note\"]}], [\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}}, {\"valid\": false}]]", "type": "add", "mask": 2, "field": "", @@ -335,7 +335,7 @@ "note", "recurrenttransaction" ], - "query": "[\"AND\", {\"destination\": [\"club\", \"note\"]}, [\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}}, {\"valid\": false}]]", + "query": "[\"AND\", {\"destination\": [\"club\", \"note\"]}, [\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}}, {\"valid\": false}]]", "type": "add", "mask": 2, "field": "", @@ -1967,7 +1967,7 @@ "note", "transaction" ], - "query": "[\"AND\", [\"OR\", {\"source\": [\"club\", \"note\"]}, {\"destination\": [\"club\", \"note\"]}], [\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": false}, {\"destination__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": true}]]", + "query": "[\"AND\", [\"OR\", {\"source\": [\"club\", \"note\"]}, {\"destination\": [\"club\", \"note\"]}], [\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}, \"valid\": false}, {\"destination__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}, \"valid\": true}]]", "type": "change", "mask": 2, "field": "valid", @@ -2063,7 +2063,7 @@ "note", "transaction" ], - "query": "[\"AND\", [\"OR\", {\"source\": [\"club\", \"note\"]}, {\"destination\": [\"club\", \"note\"]}], [\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": true}, {\"destination__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": false}]]", + "query": "[\"AND\", [\"OR\", {\"source\": [\"club\", \"note\"]}, {\"destination\": [\"club\", \"note\"]}], [\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}, \"valid\": true}, {\"destination__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}, \"valid\": false}]]", "type": "change", "mask": 2, "field": "invalidity_reason", @@ -2591,12 +2591,12 @@ "note", "transaction" ], - "query": "[\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}}, {\"valid\": false}]", + "query": "[\"OR\", {\"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 -50 €" + "description": "Créer une transaction quelconque tant que la source reste au-dessus de -20 €" } }, { @@ -2607,12 +2607,12 @@ "note", "transaction" ], - "query": "[\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": false}, {\"destination__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": true}]", + "query": "[\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}, \"valid\": false}, {\"destination__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}, \"valid\": true}]", "type": "change", "mask": 2, "field": "valid", "permanent": false, - "description": "Modifier le statut de validation d'une transaction si c'est possible" + "description": "Modifier le statut de validation d'une transaction si tout le monde reste au dessus de -20 €" } }, { @@ -2623,12 +2623,12 @@ "note", "transaction" ], - "query": "[\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": false}, {\"destination__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": true}]", + "query": "[\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}, \"valid\": false}, {\"destination__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}, \"valid\": true}]", "type": "change", "mask": 2, "field": "invalidity_reason", "permanent": false, - "description": "Modifier la raison d'invalidité d'une transaction si c'est possible" + "description": "Modifier la raison d'invalidité d'une transaction si tout le monde reste au dessus de -20 €" } }, { diff --git a/docs/apps/permission.rst b/docs/apps/permission.rst index 0ba46430..ac859151 100644 --- a/docs/apps/permission.rst +++ b/docs/apps/permission.rst @@ -118,13 +118,13 @@ Exemples {"F": [ "ADD", ["F", "source__balance"], - 5000] + 2000] } } ] - | si la destination est la note du club dont on est membre et si le montant est inférieur au solde de la source + 50 €, - autrement dit le solde final est au-dessus de -50 €. + | si la destination est la note du club dont on est membre et si le montant est inférieur au solde de la source + 20 €, + autrement dit le solde final est au-dessus de -20 €. Masques de permissions diff --git a/docs/faq.rst b/docs/faq.rst index d7971971..18b8a4be 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -83,13 +83,6 @@ Je suis trésorier d'un club, qu'ai-je le droit de faire ? bien sûr permis pour faciliter des transferts. Tout abus de droits constaté pourra mener à des sanctions prises par le bureau du BDE. -.. warning:: - Une fonctionnalité pour permettre de gérer plus proprement les remboursements - entre amis est en cours de développement. Temporairement et pour des raisons - de confort, les trésoriers de clubs ont le droit de prélever n'importe quelle - adhérente vers n'importe quelle autre note adhérente, tant que la source ne - descend pas sous ``- 50 €``. Ces droits seront retirés d'ici quelques semaines. - Je suis trésorier d'un club, je n'arrive pas à voir le solde du club / faire des transactions --------------------------------------------------------------------------------------------------- diff --git a/note_kfet/static/js/base.js b/note_kfet/static/js/base.js index 4b1b7c78..bf21b4ed 100644 --- a/note_kfet/static/js/base.js +++ b/note_kfet/static/js/base.js @@ -96,7 +96,7 @@ function displayStyle (note) { if (!note) { return '' } const balance = note.balance var css = '' - if (balance < -5000) { css += ' text-danger bg-dark' } + if (balance < -2000) { css += ' text-danger bg-dark' } else if (balance < -1000) { css += ' text-danger' } else if (balance < 0) { css += ' text-warning' } if (!note.email_confirmed) { css += ' bg-primary' }