mirror of
				https://gitlab.crans.org/bde/nk20
				synced 2025-11-04 09:12:11 +01:00 
			
		
		
		
	treasury summary
This commit is contained in:
		
							
								
								
									
										65
									
								
								apps/note/templates/note/mails/summary_notes_report.html
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										65
									
								
								apps/note/templates/note/mails/summary_notes_report.html
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,65 @@
 | 
				
			|||||||
 | 
					{% load pretty_money %}
 | 
				
			||||||
 | 
					{% load i18n %}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					<!DOCTYPE html>
 | 
				
			||||||
 | 
					<html lang="fr">
 | 
				
			||||||
 | 
					<head>
 | 
				
			||||||
 | 
					    <meta charset="UTF-8">
 | 
				
			||||||
 | 
					    <title>[Note Kfet] Récapitulatif de trésorerie</title>
 | 
				
			||||||
 | 
					</head>
 | 
				
			||||||
 | 
					<body>
 | 
				
			||||||
 | 
					<h1>
 | 
				
			||||||
 | 
					  Récapitulatif de trésorerie au {{ summary.date|date:"d/m/Y" }} à {{ summary.date|date:"H:i:s" }} :
 | 
				
			||||||
 | 
					</h1>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					<h2>
 | 
				
			||||||
 | 
					  Tous les utilisateurs :
 | 
				
			||||||
 | 
					</h2>
 | 
				
			||||||
 | 
					<ul>
 | 
				
			||||||
 | 
					  <li>Positifs : {{ summary.total_positive_user }} soit {{ summary.balance_positive_user }} euros</li>
 | 
				
			||||||
 | 
					  <li>Neutres : {{ summary.total_zero_user }}</li>
 | 
				
			||||||
 | 
					  <li>Négatifs : {{ summary.total_negative_user }} soit {{ summary.balance_negative_user }} euros</li>
 | 
				
			||||||
 | 
					</ul>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					<h2>
 | 
				
			||||||
 | 
					  Les adhérents BDE :
 | 
				
			||||||
 | 
					</h2>
 | 
				
			||||||
 | 
					<ul>
 | 
				
			||||||
 | 
					  <li>Positifs : {{ summary.total_positive_user_bde }} soit {{ summary.balance_positive_user_bde }} euros</li>
 | 
				
			||||||
 | 
					  <li>Neutres : {{ summary.total_zero_user_bde }}</li>
 | 
				
			||||||
 | 
					  <li>Négatifs : {{ summary.total_negative_user_bde }} soit {{ summary.balance_negative_user_bde }} euros</li>
 | 
				
			||||||
 | 
					</ul>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					<h2>
 | 
				
			||||||
 | 
					  Clubs :
 | 
				
			||||||
 | 
					</h2>
 | 
				
			||||||
 | 
					<ul>
 | 
				
			||||||
 | 
					  <li>Positifs : {{ summary.total_positive_club }} soit {{ summary.balance_positive_club }} euros</li>
 | 
				
			||||||
 | 
					  <li>Neutres : {{ summary.total_zero_club }}</li>
 | 
				
			||||||
 | 
					  <li>Négatifs : {{ summary.total_negative_club }} soit {{ summary.balance_negative_club }} euros</li>
 | 
				
			||||||
 | 
					</ul>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					<h2>
 | 
				
			||||||
 | 
					  Clubs hors BDE / Kfet et club dont le nom fini par "- BDE" :
 | 
				
			||||||
 | 
					</h2>
 | 
				
			||||||
 | 
					<ul>
 | 
				
			||||||
 | 
					  <li>Positifs : {{ summary.total_positive_club_nbde }} soit {{ summary.balance_positive_club_nbde }} euros</li>
 | 
				
			||||||
 | 
					  <li>Neutres : {{ summary.total_zero_club_nbde }}</li>
 | 
				
			||||||
 | 
					  <li>Négatifs : {{ summary.total_negative_club_nbde }} soit {{ summary.balance_negative_club_nbde }} euros</li>
 | 
				
			||||||
 | 
					</ul>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					<h2>
 | 
				
			||||||
 | 
					  Progression:
 | 
				
			||||||
 | 
					</h2>
 | 
				
			||||||
 | 
					<ul>
 | 
				
			||||||
 | 
					  <li>Ceci correspond à une différence de {{ balance_difference_user }} euros pour les utilisateurs</li>
 | 
				
			||||||
 | 
					  <li>Ceci correspond à une différence de {{ balance_difference_club }} euros pour les clubs</li>
 | 
				
			||||||
 | 
					</ul>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					--
 | 
				
			||||||
 | 
					<p>
 | 
				
			||||||
 | 
					    Le BDE<br>
 | 
				
			||||||
 | 
					    {% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %}
 | 
				
			||||||
 | 
					</p>
 | 
				
			||||||
 | 
					</body>
 | 
				
			||||||
 | 
					</html>
 | 
				
			||||||
							
								
								
									
										33
									
								
								apps/note/templates/note/mails/summary_notes_report.txt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										33
									
								
								apps/note/templates/note/mails/summary_notes_report.txt
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,33 @@
 | 
				
			|||||||
 | 
					{% load pretty_money %}
 | 
				
			||||||
 | 
					{% load i18n %}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Récapitulatif de trésorerie au {{ summary.date|date:"d/m/Y" }} à {{ summary.date|date:"H:i:s" }} :
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Tous les utilisateurs :
 | 
				
			||||||
 | 
					  - Positifs : {{ summary.total_positive_user }} soit {{ summary.balance_positive_user }} euros
 | 
				
			||||||
 | 
					  - Neutres : {{ summary.total_zero_user }}
 | 
				
			||||||
 | 
					  - Négatifs : {{ summary.total_negative_user }} soit {{ summary.balance_negative_user }} euros
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Les adhérents BDE :
 | 
				
			||||||
 | 
					  - Positifs : {{ summary.total_positive_user_bde }} soit {{ summary.balance_positive_user_bde }} euros
 | 
				
			||||||
 | 
					  - Neutres : {{ summary.total_zero_user_bde }}
 | 
				
			||||||
 | 
					  - Négatifs : {{ summary.total_negative_user_bde }} soit {{ summary.balance_negative_user_bde }} euros
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Clubs :
 | 
				
			||||||
 | 
					  - Positifs : {{ summary.total_positive_club }} soit {{ summary.balance_positive_club }} euros
 | 
				
			||||||
 | 
					  - Neutres : {{ summary.total_zero_club }}
 | 
				
			||||||
 | 
					  - Négatifs : {{ summary.total_negative_club }} soit {{ summary.balance_negative_club }} euros
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Clubs hors BDE / Kfet et club dont le nom fini par "- BDE" :
 | 
				
			||||||
 | 
					  - Positifs : {{ summary.total_positive_club_nbde }} soit {{ summary.balance_positive_club_nbde }} euros
 | 
				
			||||||
 | 
					  - Neutres : {{ summary.total_zero_club_nbde }}
 | 
				
			||||||
 | 
					  - Négatifs : {{ summary.total_negative_club_nbde }} soit {{ summary.balance_negative_club_nbde }} euros
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Progression:
 | 
				
			||||||
 | 
					  - Ceci correspond à une différence de {{ balance_difference_user }} euros pour les utilisateurs
 | 
				
			||||||
 | 
					  - Ceci correspond à une différence de {{ balance_difference_club }} euros pour les clubs
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					--
 | 
				
			||||||
 | 
					Le BDE
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					{% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %}
 | 
				
			||||||
 Submodule apps/scripts updated: f580f9b9e9...f76acb3248
									
								
							@@ -460,3 +460,117 @@ class SogeCredit(models.Model):
 | 
				
			|||||||
            self.credit_transaction._force_save = True
 | 
					            self.credit_transaction._force_save = True
 | 
				
			||||||
            self.credit_transaction.save()
 | 
					            self.credit_transaction.save()
 | 
				
			||||||
        super().delete(**kwargs)
 | 
					        super().delete(**kwargs)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class NoteSummary(models.Model):
 | 
				
			||||||
 | 
					    """
 | 
				
			||||||
 | 
					    Summary of every notes
 | 
				
			||||||
 | 
					    """
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    date = models.DateField(
 | 
				
			||||||
 | 
					        default=date.today,
 | 
				
			||||||
 | 
					        verbose_name=_("Date"),
 | 
				
			||||||
 | 
					    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    total_positive_user = models.PositiveIntegerField(
 | 
				
			||||||
 | 
					        verbose_name=_("Total positive user"),
 | 
				
			||||||
 | 
					    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    balance_positive_user = models.PositiveIntegerField(
 | 
				
			||||||
 | 
					        verbose_name=_("Balance positive user"),
 | 
				
			||||||
 | 
					    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    total_positive_user_bde = models.PositiveIntegerField(
 | 
				
			||||||
 | 
					        verbose_name=_("Total positive user BDE"),
 | 
				
			||||||
 | 
					    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    balance_positive_user_bde = models.PositiveIntegerField(
 | 
				
			||||||
 | 
					        verbose_name=_("Balance positive user BDE"),
 | 
				
			||||||
 | 
					    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    total_zero_user = models.PositiveIntegerField(
 | 
				
			||||||
 | 
					        verbose_name=_("Total zero user"),
 | 
				
			||||||
 | 
					    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    total_zero_user_bde = models.PositiveIntegerField(
 | 
				
			||||||
 | 
					        verbose_name=_("Total zero user BDE"),
 | 
				
			||||||
 | 
					    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    total_negative_user = models.PositiveIntegerField(
 | 
				
			||||||
 | 
					        verbose_name=_("Total negative user"),
 | 
				
			||||||
 | 
					    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    balance_negative_user = models.PositiveIntegerField(
 | 
				
			||||||
 | 
					        verbose_name=_("Balance negative user"),
 | 
				
			||||||
 | 
					    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    total_negative_user_bde = models.PositiveIntegerField(
 | 
				
			||||||
 | 
					        verbose_name=_("Total negative user BDE"),
 | 
				
			||||||
 | 
					    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    balance_negative_user_bde = models.PositiveIntegerField(
 | 
				
			||||||
 | 
					        verbose_name=_("Balance negative user BDE"),
 | 
				
			||||||
 | 
					    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    total_vnegative_user = models.PositiveIntegerField(
 | 
				
			||||||
 | 
					        verbose_name=_("Total very negative user"),
 | 
				
			||||||
 | 
					    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    balance_vnegative_user = models.PositiveIntegerField(
 | 
				
			||||||
 | 
					        verbose_name=_("Balance very negative user"),
 | 
				
			||||||
 | 
					    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    total_vnegative_user_bde = models.PositiveIntegerField(
 | 
				
			||||||
 | 
					        verbose_name=_("Total very negative user BDE"),
 | 
				
			||||||
 | 
					    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    balance_vnegative_user_bde = models.PositiveIntegerField(
 | 
				
			||||||
 | 
					        verbose_name=_("Balance very negative user BDE"),
 | 
				
			||||||
 | 
					    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    total_positive_club = models.PositiveIntegerField(
 | 
				
			||||||
 | 
					        verbose_name=_("Total positive club"),
 | 
				
			||||||
 | 
					    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    balance_positive_club = models.PositiveIntegerField(
 | 
				
			||||||
 | 
					        verbose_name=_("Balance positive club"),
 | 
				
			||||||
 | 
					    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    total_positive_club_nbde = models.PositiveIntegerField(
 | 
				
			||||||
 | 
					        verbose_name=_("Total positive club nbde"),
 | 
				
			||||||
 | 
					    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    balance_positive_club_nbde = models.PositiveIntegerField(
 | 
				
			||||||
 | 
					        verbose_name=_("Balance positive club nbde"),
 | 
				
			||||||
 | 
					    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    total_zero_club = models.PositiveIntegerField(
 | 
				
			||||||
 | 
					        verbose_name=_("Total zero club"),
 | 
				
			||||||
 | 
					    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    total_zero_club_nbde = models.PositiveIntegerField(
 | 
				
			||||||
 | 
					        verbose_name=_("Total zero club nbde"),
 | 
				
			||||||
 | 
					    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    total_negative_club = models.PositiveIntegerField(
 | 
				
			||||||
 | 
					        verbose_name=_("Total negative club"),
 | 
				
			||||||
 | 
					    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    balance_negative_club = models.PositiveIntegerField(
 | 
				
			||||||
 | 
					        verbose_name=_("Balance negative club"),
 | 
				
			||||||
 | 
					    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    total_negative_club_nbde = models.PositiveIntegerField(
 | 
				
			||||||
 | 
					        verbose_name=_("Total negative club nbde"),
 | 
				
			||||||
 | 
					    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    balance_negative_club_nbde = models.PositiveIntegerField(
 | 
				
			||||||
 | 
					        verbose_name=_("Balance negative club nbde"),
 | 
				
			||||||
 | 
					    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    class Meta:
 | 
				
			||||||
 | 
					        verbose_name = _("Summary")
 | 
				
			||||||
 | 
					        verbose_name_plural = _("Summaries")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    def __str__(self):
 | 
				
			||||||
 | 
					        return "Note summary of {date}".format(date=self.date)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -19,6 +19,8 @@ MAILTO=notekfet2020@lists.crans.org
 | 
				
			|||||||
 00  5     *   *   2     root   cd /var/www/note_kfet && env/bin/python manage.py send_mail_to_negative_balances --spam --negative-amount 1 -v 0
 | 
					 00  5     *   *   2     root   cd /var/www/note_kfet && env/bin/python manage.py send_mail_to_negative_balances --spam --negative-amount 1 -v 0
 | 
				
			||||||
# Envoyer le rapport mensuel aux trésoriers et respos info
 | 
					# Envoyer le rapport mensuel aux trésoriers et respos info
 | 
				
			||||||
 00  8     *   *   5     root   cd /var/www/note_kfet && env/bin/python manage.py send_mail_to_negative_balances --report --add-years 1 -v 0
 | 
					 00  8     *   *   5     root   cd /var/www/note_kfet && env/bin/python manage.py send_mail_to_negative_balances --report --add-years 1 -v 0
 | 
				
			||||||
 | 
					# Envoyer le recap de tresorerie
 | 
				
			||||||
 | 
					 00  8     *   *   5     root   cd /var/www/note_kfet && env/bin/python manage.py send_summary_notes_report --negative-amount 2000
 | 
				
			||||||
# Envoyer les rapports aux gens
 | 
					# Envoyer les rapports aux gens
 | 
				
			||||||
 55  6     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py send_reports -v 0
 | 
					 55  6     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py send_reports -v 0
 | 
				
			||||||
# Mettre à jour les boutons mis en avant
 | 
					# Mettre à jour les boutons mis en avant
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user