rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-23 20:03:11 +00:00
Code Issues Releases Wiki Activity

Merge branch 'hotfix_front' into 'dev'

Browse source 
Hotfix : users.end_conn + python2 header

See merge request federez/re2o!266
This commit is contained in:
chirac 2018-08-24 17:07:34 +02:00
commit 5208a9ca82
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cotisations/tex.py
View file

@ -1,3 +1,4 @@
#-*- coding: utf-8 -*-
# Re2o est un logiciel d'administration développé initiallement au rezometz. Il # Re2o est un logiciel d'administration développé initiallement au rezometz. Il
# se veut agnostique au réseau considéré, de manière à être installable en # se veut agnostique au réseau considéré, de manière à être installable en
# quelques clics. # quelques clics.
@ -24,6 +25,7 @@ Module in charge of rendering some LaTex templates.
Used to generated PDF invoice. Used to generated PDF invoice.
""" """
import tempfile import tempfile
from subprocess import Popen, PIPE from subprocess import Popen, PIPE
import os import os

2
users/templates/users/profil.html
View file

@ -64,7 +64,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</div> </div>
{% else %} {% else %}
<div class="panel panel-success"> <div class="panel panel-success">
<div class="panel-heading dashboard">{% blocktrans with end_connection=user.end_access|date:"SHORT_DATE_FORMAT" %}Connection (until {{ end_connection }} ){% endblocktrans %}</div> <div class="panel-heading dashboard">{% blocktrans with end_connection=users.end_access|date:"SHORT_DATE_FORMAT" %}Connection (until {{ end_connection }} ){% endblocktrans %}</div>
<div class="panel-body dashboard"> <div class="panel-body dashboard">
{% can_create Facture %} {% can_create Facture %}
<a class="btn btn-success btn-sm" role="button" href="{% url 'cotisations:new-facture' users.id %}"> <a class="btn btn-success btn-sm" role="button" href="{% url 'cotisations:new-facture' users.id %}">