Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
re2o
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nounous
re2o
Commits
1cc5d7bb
Commit
1cc5d7bb
authored
Jan 20, 2019
by
chirac
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'translation' into 'dev'
Translation See merge request federez/re2o!396
parents
54a5dca8
1c28c2d1
Pipeline
#944
failed with stage
Changes
162
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
162 changed files
with
3169 additions
and
2104 deletions
+3169
-2104
api/acl.py
api/acl.py
+3
-2
api/authentication.py
api/authentication.py
+1
-1
api/locale/fr/LC_MESSAGES/django.po
api/locale/fr/LC_MESSAGES/django.po
+40
-0
cotisations/forms.py
cotisations/forms.py
+3
-3
cotisations/locale/fr/LC_MESSAGES/django.po
cotisations/locale/fr/LC_MESSAGES/django.po
+272
-165
cotisations/models.py
cotisations/models.py
+1
-1
cotisations/payment_methods/note_kfet/views.py
cotisations/payment_methods/note_kfet/views.py
+2
-2
cotisations/templates/cotisations/aff_article.html
cotisations/templates/cotisations/aff_article.html
+1
-3
cotisations/templates/cotisations/aff_cost_estimate.html
cotisations/templates/cotisations/aff_cost_estimate.html
+3
-3
cotisations/templates/cotisations/aff_cotisations.html
cotisations/templates/cotisations/aff_cotisations.html
+2
-2
cotisations/templates/cotisations/aff_custom_invoice.html
cotisations/templates/cotisations/aff_custom_invoice.html
+4
-4
cotisations/templates/cotisations/aff_paiement.html
cotisations/templates/cotisations/aff_paiement.html
+1
-3
cotisations/templates/cotisations/control.html
cotisations/templates/cotisations/control.html
+3
-3
cotisations/templates/cotisations/delete.html
cotisations/templates/cotisations/delete.html
+1
-1
cotisations/templates/cotisations/edit_facture.html
cotisations/templates/cotisations/edit_facture.html
+2
-2
cotisations/templates/cotisations/facture.html
cotisations/templates/cotisations/facture.html
+1
-1
cotisations/templates/cotisations/index.html
cotisations/templates/cotisations/index.html
+1
-1
cotisations/templates/cotisations/index_article.html
cotisations/templates/cotisations/index_article.html
+2
-2
cotisations/templates/cotisations/index_banque.html
cotisations/templates/cotisations/index_banque.html
+2
-2
cotisations/templates/cotisations/index_cost_estimate.html
cotisations/templates/cotisations/index_cost_estimate.html
+3
-3
cotisations/templates/cotisations/index_custom_invoice.html
cotisations/templates/cotisations/index_custom_invoice.html
+3
-3
cotisations/templates/cotisations/index_paiement.html
cotisations/templates/cotisations/index_paiement.html
+1
-1
cotisations/templates/cotisations/payment.html
cotisations/templates/cotisations/payment.html
+1
-1
cotisations/templates/cotisations/sidebar.html
cotisations/templates/cotisations/sidebar.html
+10
-10
cotisations/views.py
cotisations/views.py
+4
-4
logs/locale/fr/LC_MESSAGES/django.po
logs/locale/fr/LC_MESSAGES/django.po
+52
-44
logs/templates/logs/aff_stats_logs.html
logs/templates/logs/aff_stats_logs.html
+4
-4
logs/templates/logs/aff_summary.html
logs/templates/logs/aff_summary.html
+3
-3
logs/templates/logs/delete.html
logs/templates/logs/delete.html
+1
-1
logs/templates/logs/index.html
logs/templates/logs/index.html
+2
-2
logs/templates/logs/sidebar.html
logs/templates/logs/sidebar.html
+7
-7
logs/templates/logs/stats_general.html
logs/templates/logs/stats_general.html
+2
-2
logs/templates/logs/stats_logs.html
logs/templates/logs/stats_logs.html
+2
-2
logs/templates/logs/stats_models.html
logs/templates/logs/stats_models.html
+2
-2
logs/templates/logs/stats_users.html
logs/templates/logs/stats_users.html
+2
-2
machines/locale/fr/LC_MESSAGES/django.po
machines/locale/fr/LC_MESSAGES/django.po
+326
-297
machines/migrations/0101_auto_20190108_1623.py
machines/migrations/0101_auto_20190108_1623.py
+34
-0
machines/models.py
machines/models.py
+10
-9
machines/templates/machines/aff_alias.html
machines/templates/machines/aff_alias.html
+1
-1
machines/templates/machines/aff_dname.html
machines/templates/machines/aff_dname.html
+1
-1
machines/templates/machines/aff_extension.html
machines/templates/machines/aff_extension.html
+1
-1
machines/templates/machines/aff_iptype.html
machines/templates/machines/aff_iptype.html
+1
-1
machines/templates/machines/aff_ipv6.html
machines/templates/machines/aff_ipv6.html
+2
-2
machines/templates/machines/aff_machines.html
machines/templates/machines/aff_machines.html
+9
-9
machines/templates/machines/aff_machinetype.html
machines/templates/machines/aff_machinetype.html
+1
-1
machines/templates/machines/aff_mx.html
machines/templates/machines/aff_mx.html
+1
-1
machines/templates/machines/aff_nas.html
machines/templates/machines/aff_nas.html
+1
-1
machines/templates/machines/aff_ns.html
machines/templates/machines/aff_ns.html
+1
-1
machines/templates/machines/aff_role.html
machines/templates/machines/aff_role.html
+1
-1
machines/templates/machines/aff_service.html
machines/templates/machines/aff_service.html
+1
-1
machines/templates/machines/aff_soa.html
machines/templates/machines/aff_soa.html
+1
-1
machines/templates/machines/aff_srv.html
machines/templates/machines/aff_srv.html
+1
-1
machines/templates/machines/aff_sshfp.html
machines/templates/machines/aff_sshfp.html
+2
-2
machines/templates/machines/aff_txt.html
machines/templates/machines/aff_txt.html
+1
-1
machines/templates/machines/aff_vlan.html
machines/templates/machines/aff_vlan.html
+1
-1
machines/templates/machines/delete.html
machines/templates/machines/delete.html
+3
-4
machines/templates/machines/edit_portlist.html
machines/templates/machines/edit_portlist.html
+1
-1
machines/templates/machines/index.html
machines/templates/machines/index.html
+2
-2
machines/templates/machines/index_alias.html
machines/templates/machines/index_alias.html
+2
-2
machines/templates/machines/index_extension.html
machines/templates/machines/index_extension.html
+8
-8
machines/templates/machines/index_iptype.html
machines/templates/machines/index_iptype.html
+2
-2
machines/templates/machines/index_ipv6.html
machines/templates/machines/index_ipv6.html
+2
-2
machines/templates/machines/index_machinetype.html
machines/templates/machines/index_machinetype.html
+2
-2
machines/templates/machines/index_nas.html
machines/templates/machines/index_nas.html
+2
-2
machines/templates/machines/index_portlist.html
machines/templates/machines/index_portlist.html
+1
-1
machines/templates/machines/index_role.html
machines/templates/machines/index_role.html
+2
-2
machines/templates/machines/index_service.html
machines/templates/machines/index_service.html
+3
-3
machines/templates/machines/index_sshfp.html
machines/templates/machines/index_sshfp.html
+2
-2
machines/templates/machines/index_vlan.html
machines/templates/machines/index_vlan.html
+2
-2
machines/templates/machines/machine.html
machines/templates/machines/machine.html
+2
-1
machines/templates/machines/sidebar.html
machines/templates/machines/sidebar.html
+11
-10
preferences/forms.py
preferences/forms.py
+1
-1
preferences/locale/fr/LC_MESSAGES/django.po
preferences/locale/fr/LC_MESSAGES/django.po
+688
-230
preferences/migrations/0058_auto_20190108_1650.py
preferences/migrations/0058_auto_20190108_1650.py
+208
-0
preferences/models.py
preferences/models.py
+60
-66
preferences/templates/preferences/aff_radiuskey.html
preferences/templates/preferences/aff_radiuskey.html
+18
-18
preferences/templates/preferences/aff_radiusoptions.html
preferences/templates/preferences/aff_radiusoptions.html
+7
-7
preferences/templates/preferences/aff_reminder.html
preferences/templates/preferences/aff_reminder.html
+18
-18
preferences/templates/preferences/aff_service.html
preferences/templates/preferences/aff_service.html
+7
-9
preferences/templates/preferences/aff_switchmanagementcred.html
...ences/templates/preferences/aff_switchmanagementcred.html
+16
-16
preferences/templates/preferences/delete.html
preferences/templates/preferences/delete.html
+6
-4
preferences/templates/preferences/display_preferences.html
preferences/templates/preferences/display_preferences.html
+36
-36
preferences/templates/preferences/edit_preferences.html
preferences/templates/preferences/edit_preferences.html
+1
-1
preferences/templates/preferences/preferences.html
preferences/templates/preferences/preferences.html
+1
-1
preferences/templates/preferences/sidebar.html
preferences/templates/preferences/sidebar.html
+1
-1
preferences/views.py
preferences/views.py
+20
-19
re2o/base.py
re2o/base.py
+2
-2
re2o/locale/fr/LC_MESSAGES/django.po
re2o/locale/fr/LC_MESSAGES/django.po
+35
-19
re2o/templates/re2o/about.html
re2o/templates/re2o/about.html
+1
-1
re2o/templates/re2o/contact.html
re2o/templates/re2o/contact.html
+1
-1
re2o/templates/re2o/history.html
re2o/templates/re2o/history.html
+2
-2
re2o/templates/re2o/index.html
re2o/templates/re2o/index.html
+5
-5
re2o/templates/re2o/sidebar.html
re2o/templates/re2o/sidebar.html
+1
-1
re2o/views.py
re2o/views.py
+1
-1
search/forms.py
search/forms.py
+1
-1
search/locale/fr/LC_MESSAGES/django.po
search/locale/fr/LC_MESSAGES/django.po
+21
-17
search/templates/search/index.html
search/templates/search/index.html
+12
-12
search/templates/search/search.html
search/templates/search/search.html
+3
-3
search/templates/search/sidebar.html
search/templates/search/sidebar.html
+3
-3
templates/base.html
templates/base.html
+13
-13
templates/locale/fr/LC_MESSAGES/django.po
templates/locale/fr/LC_MESSAGES/django.po
+57
-44
templates/registration/login.html
templates/registration/login.html
+1
-1
topologie/locale/fr/LC_MESSAGES/django.po
topologie/locale/fr/LC_MESSAGES/django.po
+310
-174
topologie/migrations/0069_auto_20190108_1439.py
topologie/migrations/0069_auto_20190108_1439.py
+59
-0
topologie/models.py
topologie/models.py
+24
-21
topologie/templates/topologie/aff_ap.html
topologie/templates/topologie/aff_ap.html
+7
-11
topologie/templates/topologie/aff_building.html
topologie/templates/topologie/aff_building.html
+6
-10
topologie/templates/topologie/aff_chambres.html
topologie/templates/topologie/aff_chambres.html
+5
-9
topologie/templates/topologie/aff_constructor_switch.html
topologie/templates/topologie/aff_constructor_switch.html
+5
-9
topologie/templates/topologie/aff_model_switch.html
topologie/templates/topologie/aff_model_switch.html
+7
-13
topologie/templates/topologie/aff_modules.html
topologie/templates/topologie/aff_modules.html
+9
-19
topologie/templates/topologie/aff_port.html
topologie/templates/topologie/aff_port.html
+6
-10
topologie/templates/topologie/aff_port_profile.html
topologie/templates/topologie/aff_port_profile.html
+4
-4
topologie/templates/topologie/aff_repr_switch.html
topologie/templates/topologie/aff_repr_switch.html
+3
-2
topologie/templates/topologie/aff_stacks.html
topologie/templates/topologie/aff_stacks.html
+5
-9
topologie/templates/topologie/aff_switch.html
topologie/templates/topologie/aff_switch.html
+10
-10
topologie/templates/topologie/aff_switch_bay.html
topologie/templates/topologie/aff_switch_bay.html
+7
-11
topologie/templates/topologie/aff_vlanoptions.html
topologie/templates/topologie/aff_vlanoptions.html
+8
-7
topologie/templates/topologie/delete.html
topologie/templates/topologie/delete.html
+1
-1
topologie/templates/topologie/edit_stack_sw.html
topologie/templates/topologie/edit_stack_sw.html
+2
-6
topologie/templates/topologie/index.html
topologie/templates/topologie/index.html
+2
-2
topologie/templates/topologie/index_ap.html
topologie/templates/topologie/index_ap.html
+2
-2
topologie/templates/topologie/index_model_switch.html
topologie/templates/topologie/index_model_switch.html
+3
-3
topologie/templates/topologie/index_module.html
topologie/templates/topologie/index_module.html
+3
-3
topologie/templates/topologie/index_p.html
topologie/templates/topologie/index_p.html
+6
-6
topologie/templates/topologie/index_physical_grouping.html
topologie/templates/topologie/index_physical_grouping.html
+4
-4
topologie/templates/topologie/index_portprofile.html
topologie/templates/topologie/index_portprofile.html
+4
-4
topologie/templates/topologie/index_room.html
topologie/templates/topologie/index_room.html
+2
-2
topologie/templates/topologie/sidebar.html
topologie/templates/topologie/sidebar.html
+9
-9
topologie/templates/topologie/switch.html
topologie/templates/topologie/switch.html
+2
-2
topologie/templates/topologie/topo.html
topologie/templates/topologie/topo.html
+2
-2
topologie/templates/topologie/topo_more.html
topologie/templates/topologie/topo_more.html
+1
-1
topologie/views.py
topologie/views.py
+12
-12
users/forms.py
users/forms.py
+2
-2
users/locale/fr/LC_MESSAGES/django.po
users/locale/fr/LC_MESSAGES/django.po
+374
-391
users/migrations/0080_auto_20190108_1726.py
users/migrations/0080_auto_20190108_1726.py
+20
-0
users/models.py
users/models.py
+11
-11
users/templates/users/aff_bans.html
users/templates/users/aff_bans.html
+6
-6
users/templates/users/aff_clubs.html
users/templates/users/aff_clubs.html
+6
-6
users/templates/users/aff_emailaddress.html
users/templates/users/aff_emailaddress.html
+2
-2
users/templates/users/aff_listright.html
users/templates/users/aff_listright.html
+7
-7
users/templates/users/aff_schools.html
users/templates/users/aff_schools.html
+3
-3
users/templates/users/aff_users.html
users/templates/users/aff_users.html
+7
-7
users/templates/users/aff_whitelists.html
users/templates/users/aff_whitelists.html
+6
-6
users/templates/users/delete.html
users/templates/users/delete.html
+2
-2
users/templates/users/index.html
users/templates/users/index.html
+2
-2
users/templates/users/index_ban.html
users/templates/users/index_ban.html
+2
-2
users/templates/users/index_clubs.html
users/templates/users/index_clubs.html
+2
-2
users/templates/users/index_emailaddress.html
users/templates/users/index_emailaddress.html
+2
-2
users/templates/users/index_listright.html
users/templates/users/index_listright.html
+2
-2
users/templates/users/index_rights.html
users/templates/users/index_rights.html
+2
-2
users/templates/users/index_schools.html
users/templates/users/index_schools.html
+3
-3
users/templates/users/index_serviceusers.html
users/templates/users/index_serviceusers.html
+2
-2
users/templates/users/index_shell.html
users/templates/users/index_shell.html
+2
-2
users/templates/users/index_whitelist.html
users/templates/users/index_whitelist.html
+2
-2
users/templates/users/mass_archive.html
users/templates/users/mass_archive.html
+2
-2
users/templates/users/plugin_out.html
users/templates/users/plugin_out.html
+1
-1
users/templates/users/profil.html
users/templates/users/profil.html
+13
-14
users/templates/users/sidebar.html
users/templates/users/sidebar.html
+12
-12
users/templates/users/user.html
users/templates/users/user.html
+1
-1
users/templates/users/user_autocapture.html
users/templates/users/user_autocapture.html
+7
-7
users/views.py
users/views.py
+1
-1
No files found.
api/acl.py
View file @
1cc5d7bb
...
...
@@ -28,7 +28,7 @@ done.
from
django.conf
import
settings
from
django.contrib.auth.models
import
Permission
from
django.contrib.contenttypes.models
import
ContentType
from
django.utils.translation
import
ugettext
_lazy
as
_
from
django.utils.translation
import
ugettext
as
_
def
_create_api_permission
():
...
...
@@ -71,4 +71,5 @@ def can_view(user):
'codename'
:
settings
.
API_PERMISSION_CODENAME
}
can
=
user
.
has_perm
(
'%(app_label)s.%(codename)s'
%
kwargs
)
return
can
,
None
if
can
else
_
(
"You cannot see this application."
)
return
can
,
None
if
can
else
_
(
"You don't have the right to see this"
" application."
)
api/authentication.py
View file @
1cc5d7bb
...
...
@@ -46,6 +46,6 @@ class ExpiringTokenAuthentication(TokenAuthentication):
)
utc_now
=
datetime
.
datetime
.
now
(
datetime
.
timezone
.
utc
)
if
token
.
created
<
utc_now
-
token_duration
:
raise
exceptions
.
AuthenticationFailed
(
_
(
'Token has expired'
))
raise
exceptions
.
AuthenticationFailed
(
_
(
"The token has expired."
))
return
token
.
user
,
token
api/locale/fr/LC_MESSAGES/django.po
0 → 100644
View file @
1cc5d7bb
# 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
# quelques clics.
#
# Copyright © 2018 Maël Kervella
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
msgid ""
msgstr ""
"Project-Id-Version: 2.5\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-08 23:06+0100\n"
"PO-Revision-Date: 2019-01-07 01:37+0100\n"
"Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
"Language-Team: \n"
"Language: fr_FR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: acl.py:74
msgid "You don't have the right to see this application."
msgstr "Vous n'avez pas le droit de voir cette application."
#: authentication.py:49
msgid "The token has expired."
msgstr "Le jeton a expiré."
cotisations/forms.py
View file @
1cc5d7bb
...
...
@@ -116,7 +116,7 @@ class DiscountForm(Form):
Form used in oder to create a discount on an invoice.
"""
is_relative
=
forms
.
BooleanField
(
label
=
_
(
"Discount is on percentage"
),
label
=
_
(
"Discount is on percentage
.
"
),
required
=
False
,
)
discount
=
forms
.
DecimalField
(
...
...
@@ -310,8 +310,8 @@ class RechargeForm(FormRevMixin, Form):
if
balance_method
.
maximum_balance
is
not
None
and
\
value
+
self
.
user
.
solde
>
balance_method
.
maximum_balance
:
raise
forms
.
ValidationError
(
_
(
"Requested amount is too high. Your balance can't exceed
\
%(max_online_balance)s €."
)
%
{
_
(
"Requested amount is too high. Your balance can't exceed
"
"
%(max_online_balance)s €."
)
%
{
'max_online_balance'
:
balance_method
.
maximum_balance
}
)
...
...
cotisations/locale/fr/LC_MESSAGES/django.po
View file @
1cc5d7bb
This diff is collapsed.
Click to expand it.
cotisations/models.py
View file @
1cc5d7bb
...
...
@@ -341,7 +341,7 @@ class CostEstimate(CustomInvoice):
"to delete a cost estimate."
)
if
self
.
final_invoice
is
not
None
:
return
False
,
_
(
"The cost estimate has an "
"invoice and can
no
t be deleted."
)
"invoice and can
'
t be deleted."
)
return
True
,
None
...
...
cotisations/payment_methods/note_kfet/views.py
View file @
1cc5d7bb
...
...
@@ -57,7 +57,7 @@ def note_payment(request, facture, factureid):
user
=
facture
.
user
payment_method
=
find_payment_method
(
facture
.
paiement
)
if
not
payment_method
or
not
isinstance
(
payment_method
,
NotePayment
):
messages
.
error
(
request
,
"Erreur inconnue"
)
messages
.
error
(
request
,
_
(
"Unknown error."
)
)
return
redirect
(
reverse
(
'users:profil'
,
kwargs
=
{
'userid'
:
user
.
id
}
...
...
@@ -85,7 +85,7 @@ def note_payment(request, facture, factureid):
)
facture
.
valid
=
True
facture
.
save
()
messages
.
success
(
request
,
"Le paiement par note a bien été effectué"
)
messages
.
success
(
request
,
_
(
"The payment with note was done."
)
)
return
redirect
(
reverse
(
'users:profil'
,
kwargs
=
{
'userid'
:
user
.
id
}
...
...
cotisations/templates/cotisations/aff_article.html
View file @
1cc5d7bb
...
...
@@ -49,9 +49,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<td>
{{ article.available_for_everyone | tick }}
</td>
<td
class=
"text-right"
>
{% can_edit article %}
<a
class=
"btn btn-primary btn-sm"
role=
"button"
title=
"{% trans "
Edit
"
%}"
href=
"{% url 'cotisations:edit-article' article.id %}"
>
<i
class=
"fa fa-edit"
></i>
</a>
{% include 'buttons/edit.html' with href='cotisations:edit-article' id=article.id %}
{% acl_end %}
{% history_button article %}
</td>
...
...
cotisations/templates/cotisations/aff_cost_estimate.html
View file @
1cc5d7bb
...
...
@@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<div
class=
"table-responsive"
>
{% if cost_estimate_list.paginator %}
{% include 'pagination.html' with list=cost_estimate_list%}
{% include 'pagination.html' with list=cost_estimate_list%}
{% endif %}
<table
class=
"table table-striped"
>
...
...
@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<tr>
<th>
{% trans "Recipient" as tr_recip %}
{% include 'buttons/sort.html' with prefix='invoice' col='user' text=tr_
user
%}
{% include 'buttons/sort.html' with prefix='invoice' col='user' text=tr_
recip
%}
</th>
<th>
{% trans "Designation" %}
</th>
<th>
{% trans "Total price" %}
</th>
...
...
@@ -96,6 +96,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</table>
{% if custom_invoice_list.paginator %}
{% include 'pagination.html' with list=custom_invoice_list %}
{% include 'pagination.html' with list=custom_invoice_list %}
{% endif %}
</div>
cotisations/templates/cotisations/aff_cotisations.html
View file @
1cc5d7bb
...
...
@@ -28,7 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<div
class=
"table-responsive"
>
{% if facture_list.paginator %}
{% include 'pagination.html' with list=facture_list %}
{% include 'pagination.html' with list=facture_list %}
{% endif %}
<table
class=
"table table-striped"
>
...
...
@@ -89,7 +89,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</table>
{% if facture_list.paginator %}
{% include 'pagination.html' with list=facture_list %}
{% include 'pagination.html' with list=facture_list %}
{% endif %}
</div>
cotisations/templates/cotisations/aff_custom_invoice.html
View file @
1cc5d7bb
...
...
@@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<div
class=
"table-responsive"
>
{% if custom_invoice_list.paginator %}
{% include 'pagination.html' with list=custom_invoice_list %}
{% include 'pagination.html' with list=custom_invoice_list %}
{% endif %}
<table
class=
"table table-striped"
>
...
...
@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<tr>
<th>
{% trans "Recipient" as tr_recip %}
{% include 'buttons/sort.html' with prefix='invoice' col='user' text=tr_
user
%}
{% include 'buttons/sort.html' with prefix='invoice' col='user' text=tr_
recip
%}
</th>
<th>
{% trans "Designation" %}
</th>
<th>
{% trans "Total price" %}
</th>
...
...
@@ -51,7 +51,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% include 'buttons/sort.html' with prefix='invoice' col='id' text=tr_invoice_id %}
</th>
<th>
{% trans "Paid" as tr_invoice_paid%}
{% trans "Paid" as tr_invoice_paid
%}
{% include 'buttons/sort.html' with prefix='invoice' col='paid' text=tr_invoice_paid %}
</th>
<th></th>
...
...
@@ -84,6 +84,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</table>
{% if custom_invoice_list.paginator %}
{% include 'pagination.html' with list=custom_invoice_list %}
{% include 'pagination.html' with list=custom_invoice_list %}
{% endif %}
</div>
cotisations/templates/cotisations/aff_paiement.html
View file @
1cc5d7bb
...
...
@@ -45,9 +45,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</td>
<td
class=
"text-right"
>
{% can_edit paiement %}
<a
class=
"btn btn-primary btn-sm"
role=
"button"
title=
"{% trans "
Edit
"
%}"
href=
"{% url 'cotisations:edit-paiement' paiement.id %}"
>
<i
class=
"fa fa-edit"
></i>
</a>
{% include 'buttons/edit.html' with href='cotisations:edit-paiement' id=paiement.id %}
{% acl_end %}
{% history_button paiement %}
</td>
...
...
cotisations/templates/cotisations/control.html
View file @
1cc5d7bb
{% extends
"cotisations/sidebar.html"
%}
{% extends
'cotisations/sidebar.html'
%}
{% comment %}
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
...
...
@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<h2>
{% trans "Invoice control and validation" %}
</h2>
{% if facture_list.paginator %}
{% include 'pagination.html' with list=facture_list %}
{% include 'pagination.html' with list=facture_list %}
{% endif %}
<form
class=
"form"
method=
"post"
>
...
...
@@ -110,6 +110,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% endblock %}
{% if facture_list.paginator %}
{% include 'pagination.html' with list=facture_list %}
{% include 'pagination.html' with list=facture_list %}
{% endif %}
cotisations/templates/cotisations/delete.html
View file @
1cc5d7bb
{% extends
"machines/sidebar.html"
%}
{% extends
'cotisations/sidebar.html'
%}
{% comment %}
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
...
...
cotisations/templates/cotisations/edit_facture.html
View file @
1cc5d7bb
{% extends
"cotisations/sidebar.html"
%}
{% extends
'cotisations/sidebar.html'
%}
{% comment %}
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
...
...
@@ -38,7 +38,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% if title %}
<h3>
{{title}}
</h3>
{% else %}
<h3>
{% trans "Edit
the
invoice" %}
</h3>
<h3>
{% trans "Edit invoice" %}
</h3>
{% endif %}
{% massive_bootstrap_form factureform 'user' %}
{{ venteform.management_form }}
...
...
cotisations/templates/cotisations/facture.html
View file @
1cc5d7bb
{% extends
"cotisations/sidebar.html"
%}
{% extends
'cotisations/sidebar.html'
%}
{% comment %}
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
...
...
cotisations/templates/cotisations/index.html
View file @
1cc5d7bb
{% extends
"cotisations/sidebar.html"
%}
{% extends
'cotisations/sidebar.html'
%}
{% comment %}
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
...
...
cotisations/templates/cotisations/index_article.html
View file @
1cc5d7bb
{% extends
"cotisations/sidebar.html"
%}
{% extends
'cotisations/sidebar.html'
%}
{% comment %}
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
...
...
@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% block title %}{% trans "Articles" %}{% endblock %}
{% block content %}
<h2>
{% trans "
Article types list
" %}
</h2>
<h2>
{% trans "
List of article types
" %}
</h2>
{% can_create Article %}
<a
class=
"btn btn-primary btn-sm"
role=
"button"
href=
"{% url 'cotisations:add-article' %}"
>
<i
class=
"fa fa-cart-plus"
></i>
{% trans "Add an article type" %}
...
...
cotisations/templates/cotisations/index_banque.html
View file @
1cc5d7bb
{% extends
"cotisations/sidebar.html"
%}
{% extends
'cotisations/sidebar.html'
%}
{% comment %}
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
...
...
@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% block title %}{% trans "Banks" %}{% endblock %}
{% block content %}
<h2>
{% trans "
Banks list
" %}
</h2>
<h2>
{% trans "
List of banks
" %}
</h2>
{% can_create Banque %}
<a
class=
"btn btn-primary btn-sm"
role=
"button"
href=
"{% url 'cotisations:add-banque' %}"
>
<i
class=
"fa fa-cart-plus"
></i>
{% trans "Add a bank" %}
...
...
cotisations/templates/cotisations/index_cost_estimate.html
View file @
1cc5d7bb
{% extends
"cotisations/sidebar.html"
%}
{% extends
'cotisations/sidebar.html'
%}
{% comment %}
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
...
...
@@ -28,9 +28,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% block title %}{% trans "Cost estimates" %}{% endblock %}
{% block content %}
<h2>
{% trans "
Cost estimates list
" %}
</h2>
<h2>
{% trans "
List of cost estimates
" %}
</h2>
{% can_create CostEstimate %}
{% include
"buttons/add.html"
with href='cotisations:new-cost-estimate'%}
{% include
'buttons/add.html'
with href='cotisations:new-cost-estimate'%}
{% acl_end %}
{% include 'cotisations/aff_cost_estimate.html' %}
{% endblock %}
cotisations/templates/cotisations/index_custom_invoice.html
View file @
1cc5d7bb
{% extends
"cotisations/sidebar.html"
%}
{% extends
'cotisations/sidebar.html'
%}
{% comment %}
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
...
...
@@ -28,9 +28,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% block title %}{% trans "Custom invoices" %}{% endblock %}
{% block content %}
<h2>
{% trans "
Custom invoices list
" %}
</h2>
<h2>
{% trans "
List of custom invoices
" %}
</h2>
{% can_create CustomInvoice %}
{% include
"buttons/add.html"
with href='cotisations:new-custom-invoice'%}
{% include
'buttons/add.html'
with href='cotisations:new-custom-invoice'%}
{% acl_end %}
{% include 'cotisations/aff_custom_invoice.html' with custom_invoice_list=custom_invoice_list %}
{% endblock %}
cotisations/templates/cotisations/index_paiement.html
View file @
1cc5d7bb
{% extends
"cotisations/sidebar.html"
%}
{% extends
'cotisations/sidebar.html'
%}
{% comment %}
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
...
...
cotisations/templates/cotisations/payment.html
View file @
1cc5d7bb
{% extends
"cotisations/sidebar.html"
%}
{% extends
'cotisations/sidebar.html'
%}
{% comment %}
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
...
...
cotisations/templates/cotisations/sidebar.html
View file @
1cc5d7bb
{% extends
"base.html"
%}
{% extends
'base.html'
%}
{% comment %}
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
...
...
@@ -28,40 +28,40 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% block sidebar %}
{% can_create CustomInvoice %}
<a
class=
"list-group-item list-group-item-success"
href=
"{% url
"
cotisations:new-custom-invoice
"
%}"
>
<a
class=
"list-group-item list-group-item-success"
href=
"{% url
'cotisations:new-custom-invoice'
%}"
>
<i
class=
"fa fa-plus"
></i>
{% trans "Create an invoice" %}
</a>
<a
class=
"list-group-item list-group-item-warning"
href=
"{% url
"
cotisations:control
"
%}"
>
<a
class=
"list-group-item list-group-item-warning"
href=
"{% url
'cotisations:control'
%}"
>
<i
class=
"fa fa-eye"
></i>
{% trans "Control the invoices" %}
</a>
{% acl_end %}
{% can_view_all Facture %}
<a
class=
"list-group-item list-group-item-info"
href=
"{% url
"
cotisations:index
"
%}"
>
<a
class=
"list-group-item list-group-item-info"
href=
"{% url
'cotisations:index'
%}"
>
<i
class=
"fa fa-list-ul"
></i>
{% trans "Invoices" %}
</a>
{% acl_end %}
{% can_view_all CustomInvoice %}
<a
class=
"list-group-item list-group-item-info"
href=
"{% url
"
cotisations:index-custom-invoice
"
%}"
>
<a
class=
"list-group-item list-group-item-info"
href=
"{% url
'cotisations:index-custom-invoice'
%}"
>
<i
class=
"fa fa-list-ul"
></i>
{% trans "Custom invoices" %}
</a>
{% acl_end %}
{% can_view_all CostEstimate %}
<a
class=
"list-group-item list-group-item-info"
href=
"{% url
"
cotisations:index-cost-estimate
"
%}"
>
<i
class=
"fa fa-list-ul"
></i>
{% trans "Cost estimate" %}
<a
class=
"list-group-item list-group-item-info"
href=
"{% url
'cotisations:index-cost-estimate'
%}"
>
<i
class=
"fa fa-list-ul"
></i>
{% trans "Cost estimate
s
" %}
</a>
{% acl_end %}
{% can_view_all Article %}
<a
class=
"list-group-item list-group-item-info"
href=
"{% url
"
cotisations:index-article
"
%}"
>
<a
class=
"list-group-item list-group-item-info"
href=
"{% url
'cotisations:index-article'
%}"
>
<i
class=
"fa fa-list-ul"
></i>
{% trans "Available articles" %}
</a>
{% acl_end %}
{% can_view_all Banque %}
<a
class=
"list-group-item list-group-item-info"
href=
"{% url
"
cotisations:index-banque
"
%}"
>
<a
class=
"list-group-item list-group-item-info"
href=
"{% url
'cotisations:index-banque'
%}"
>
<i
class=
"fa fa-list-ul"
></i>
{% trans "Banks" %}
</a>
{% acl_end %}
{% can_view_all Paiement %}
<a
class=
"list-group-item list-group-item-info"
href=
"{% url
"
cotisations:index-paiement
"
%}"
>
<a
class=
"list-group-item list-group-item-info"
href=
"{% url
'cotisations:index-paiement'
%}"
>
<i
class=
"fa fa-list-ul"
></i>
{% trans "Payment methods" %}
</a>
{% acl_end %}
...
...
cotisations/views.py
View file @
1cc5d7bb
...
...
@@ -421,7 +421,7 @@ def edit_cost_estimate(request, invoice, **kwargs):
return
form
({
'factureform'
:
invoice_form
,
'venteform'
:
purchase_form
,
'title'
:
"Edit the cost estimate"
'title'
:
_
(
"Edit cost estimate"
)
},
'cotisations/edit_facture.html'
,
request
)
...
...
@@ -531,7 +531,7 @@ def del_cost_estimate(request, estimate, **_kwargs):
return
redirect
(
reverse
(
'cotisations:index-cost-estimate'
))
return
form
({
'objet'
:
estimate
,
'objet_name'
:
_
(
"Cost
E
stimate"
)
'objet_name'
:
_
(
"Cost
e
stimate"
)
},
'cotisations/delete.html'
,
request
)
...
...
@@ -833,8 +833,8 @@ def del_banque(request, instances):
except
ProtectedError
:
messages
.
error
(
request
,
_
(
"The bank %(bank_name)s can't be deleted
\
because there
are invoices using it."
)
%
{
_
(
"The bank %(bank_name)s can't be deleted
because there"
"
are invoices using it."
)
%
{
'bank_name'
:
bank_del
}
)
...
...
logs/locale/fr/LC_MESSAGES/django.po
View file @
1cc5d7bb
...
...
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.5\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 201
8-08-15 20:12+02
00\n"
"POT-Creation-Date: 201
9-01-08 23:16+01
00\n"
"PO-Revision-Date: 2018-06-23 16:01+0200\n"
"Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
"Language-Team: \n"
...
...
@@ -57,7 +57,7 @@ msgstr "Commentaire"
#: templates/logs/aff_stats_logs.html:58 templates/logs/aff_summary.html:62
#: templates/logs/aff_summary.html:85 templates/logs/aff_summary.html:104
#: templates/logs/aff_summary.html:12
3 templates/logs/aff_summary.html:142
#: templates/logs/aff_summary.html:12
8 templates/logs/aff_summary.html:147
msgid "Cancel"
msgstr "Annuler"
...
...
@@ -113,15 +113,19 @@ msgstr "%(username)s a mis à jour"
#: templates/logs/aff_summary.html:113
#, python-format
msgid "%(username)s has sold %(number)sx %(name)s
to
"
msgstr "%(username)s a vendu %(number)sx %(name)s
à
"
msgid "%(username)s has sold %(number)sx %(name)s"
msgstr "%(username)s a vendu %(number)sx %(name)s"
#: templates/logs/aff_summary.html:116
msgid " to"
msgstr " à"
#: templates/logs/aff_summary.html:119
#, python-format
msgid "+%(duration)s months"
msgstr "+%(duration)s mois"
#: templates/logs/aff_summary.html:13
2
#: templates/logs/aff_summary.html:13
7
#, python-format
msgid "%(username)s has edited an interface of"
msgstr "%(username)s a modifié une interface de"
...
...
@@ -149,7 +153,7 @@ msgstr "Confirmer"
msgid "Statistics"
msgstr "Statistiques"
#: templates/logs/index.html:32 templates/logs/stats_logs.html:32 views.py:4
03
#: templates/logs/index.html:32 templates/logs/stats_logs.html:32 views.py:4
14
msgid "Actions performed"
msgstr "Actions effectuées"
...
...
@@ -173,7 +177,7 @@ msgstr "Base de données"
msgid "Wiring actions"
msgstr "Actions de câblage"
#: templates/logs/sidebar.html:53 views.py:3
25
#: templates/logs/sidebar.html:53 views.py:3
36
msgid "Users"
msgstr "Utilisateurs"
...
...
@@ -189,150 +193,154 @@ msgstr "Statistiques sur la base de données"
msgid "Statistics about users"
msgstr "Statistiques sur les utilisateurs"
#: views.py:19
1
#: views.py:19
4
msgid "Nonexistent revision."
msgstr "Révision inexistante."
#: views.py:19
4
#: views.py:19
7
msgid "The action was deleted."
msgstr "L'action a été supprimée."
#: views.py:2
27
#: views.py:2
30
msgid "Category"
msgstr "Catégorie"
#: views.py:2
28
#: views.py:2
31
msgid "Number of users (members and clubs)"
msgstr "Nombre d'utilisateurs (adhérents et clubs)"
#: views.py:2
29
#: views.py:2
32
msgid "Number of members"
msgstr "Nombre d'adhérents"
#: views.py:23
0
#: views.py:23
3
msgid "Number of clubs"
msgstr "Nombre de clubs"
#: views.py:23
4
#: views.py:23
7
msgid "Activated users"
msgstr "Utilisateurs activés"
#: views.py:24
2
#: views.py:24
5
msgid "Disabled users"
msgstr "Utilisateurs désactivés"
#: views.py:25
0
#: views.py:25
3
msgid "Archived users"
msgstr "Utilisateurs archivés"
#: views.py:258
#: views.py:261
msgid "Not yet active users"
msgstr "Utilisateurs pas encore actifs"
#: views.py:269
msgid "Contributing members"
msgstr "Adhérents cotisants"
#: views.py:2
64
#: views.py:2
75
msgid "Users benefiting from a connection"
msgstr "Utilisateurs bénéficiant d'une connexion"
#: views.py:2
70
#: views.py:2
81
msgid "Banned users"
msgstr "Utilisateurs bannis"
#: views.py:2
76
#: views.py:2
87
msgid "Users benefiting from a free connection"
msgstr "Utilisateurs bénéficiant d'une connexion gratuite"
#: views.py:2
82
#: views.py:2
93
msgid "Active interfaces (with access to the network)"
msgstr "Interfaces actives (ayant accès au réseau)"
#: views.py:
292
#: views.py:
303
msgid "Active interfaces assigned IPv4"
msgstr "Interfaces actives assignées IPv4"
#: views.py:3
05
#: views.py:3
16
msgid "IP range"
msgstr "Plage d'IP"