klmp200
/
Sith
mirror of https://github.com/ae-utbm/sith3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sli' into 'master' 

Edit CONTRIBUTING instructions

See merge request !20
This commit is contained in:
Skia 2016-11-06 23:27:00 +01:00
parent 20ff409547 160c7806df
commit 54d3ca8e65
5 changed files with 71 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
CONTRIBUTING.md
View File

@ -18,19 +18,26 @@ Ensuite, tu fais :
Avec cette commande, tu clones le sith AE dans le dossier courant.
cd Sith
virtualenv --clear --python=python3 env_sith`
virtualenv --clear --python=python3 env_sith
source env_sith/bin/activate
pip install -r requirements.txt
Pour avoir un peu de contenu dans le sith :
python3 manage.py loaddata users groups pages
Maintenant, faut passer le sith en mode debug dans le fichier de settings personnalisé.
echo "DEBUG=True" > sith/settings_custom.py
echo 'SITH_URL = "localhost:8000"' >> sith/settings_custom.py
Enfin, il s'agit de créer la base de donnée de test lors de la première utilisation
./manage.py setup
répondre no
Et pour lancer le sith, tu fais `python3 manage.py runserver`
Voilà, c'est le sith AE. Il y a des issues dans le gitlab qui sont à régler. Si tu as un domaine qui t'intéresse, une appli que tu voudrais développer dessus, n'hésites pas et contacte-nous.
Voilà, c'est le sith AE. Il y a des issues dans le gitlab qui sont à régler. Si tu as un domaine qui t'intéresse, une appli que tu voudrais développer, n'hésites pas et contacte-nous.
Va, et que l'AE soit avec toi.
Sites et doc cools
------------------
[Classy Class-Based Views](http://ccbv.co.uk/projects/Django/1.8/)
[Classy Class-Based Views](http://ccbv.co.uk/projects/Django/1.8/)

4
core/templates/core/user_account.jinja
View File

@ -69,7 +69,9 @@
{{ super() }}
<script>
$(function(){
$("#drop").accordion();
$("#drop").accordion({
heightStyle: "content"
});
});
</script>
{% endblock %}

2
counter/views.py
View File

@ -1058,7 +1058,7 @@ class EticketPDFView(CanViewMixin, DetailView):
p.setFont("Helvetica-Bold", 16)
p.drawCentredString(10.5 * cm, 22.6 * cm, eticket.event_date.strftime("%d %b %Y")) # FIXME with a locale
p.setFont("Helvetica-Bold", 14)
p.drawCentredString(10.5 * cm, 15 * cm, user.get_display_name())
p.drawCentredString(10.5 * cm, 15 * cm, "%s : %d %s" % (user.get_display_name(), self.object.quantity, str(_("people(s)"))))
p.setFont("Courier-Bold", 14)
qrcode = QrCodeWidget(code)
bounds = qrcode.getBounds()

BIN
locale/fr/LC_MESSAGES/django.mo
View File

Binary file not shown.

104
locale/fr/LC_MESSAGES/django.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-03 11:48+0100\n"
"POT-Creation-Date: 2016-11-03 16:28+0100\n"
"PO-Revision-Date: 2016-07-18\n"
"Last-Translator: Skia <skia@libskia.so>\n"
"Language-Team: AE info <ae.info@utbm.fr>\n"
@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: accounting/models.py:36 accounting/models.py:55 accounting/models.py:82
#: accounting/models.py:141 club/models.py:19 counter/models.py:70
#: accounting/models.py:36 accounting/models.py:58 accounting/models.py:85
#: accounting/models.py:144 club/models.py:19 counter/models.py:70
#: counter/models.py:95 counter/models.py:130 launderette/models.py:15
#: launderette/models.py:60 launderette/models.py:85
msgid "name"
@ -55,119 +55,119 @@ msgstr "site internet"
msgid "company"
msgstr "entreprise"
#: accounting/models.py:56
#: accounting/models.py:59
msgid "iban"
msgstr "IBAN"
#: accounting/models.py:57
#: accounting/models.py:60
msgid "account number"
msgstr "numero de compte"
#: accounting/models.py:58 accounting/models.py:83 club/models.py:145
#: accounting/models.py:61 accounting/models.py:86 club/models.py:145
#: counter/models.py:104 counter/models.py:131
msgid "club"
msgstr "club"
#: accounting/models.py:61
#: accounting/models.py:64
msgid "Bank account"
msgstr "Compte en banque"
#: accounting/models.py:84
#: accounting/models.py:87
msgid "bank account"
msgstr "compte en banque"
#: accounting/models.py:87
#: accounting/models.py:90
msgid "Club account"
msgstr "Compte club"
#: accounting/models.py:132
#: accounting/models.py:135
#, python-format
msgid "%(club_account)s on %(bank_account)s"
msgstr "%(club_account)s sur %(bank_account)s"
#: accounting/models.py:139 club/models.py:146 counter/models.py:380
#: accounting/models.py:142 club/models.py:146 counter/models.py:380
#: launderette/models.py:122
msgid "start date"
msgstr "date de début"
#: accounting/models.py:140 club/models.py:147 counter/models.py:381
#: accounting/models.py:143 club/models.py:147 counter/models.py:381
msgid "end date"
msgstr "date de fin"
#: accounting/models.py:142
#: accounting/models.py:145
msgid "is closed"
msgstr "est fermé"
#: accounting/models.py:143 accounting/models.py:346
#: accounting/models.py:146 accounting/models.py:349
msgid "club account"
msgstr "compte club"
#: accounting/models.py:144 accounting/models.py:190 counter/models.py:28
#: accounting/models.py:147 accounting/models.py:193 counter/models.py:28
#: counter/models.py:234
msgid "amount"
msgstr "montant"
#: accounting/models.py:145
#: accounting/models.py:148
msgid "effective_amount"
msgstr "montant effectif"
#: accounting/models.py:148
#: accounting/models.py:151
msgid "General journal"
msgstr "Classeur"
#: accounting/models.py:188
#: accounting/models.py:191
msgid "number"
msgstr "numéro"
#: accounting/models.py:189
#: accounting/models.py:192
msgid "journal"
msgstr "classeur"
#: accounting/models.py:191 core/models.py:498 core/models.py:776
#: accounting/models.py:194 core/models.py:498 core/models.py:776
#: counter/models.py:237 counter/models.py:280 counter/models.py:397
#: eboutic/models.py:15 eboutic/models.py:48
msgid "date"
msgstr "date"
#: accounting/models.py:192 counter/models.py:398
#: accounting/models.py:195 counter/models.py:398
msgid "comment"
msgstr "commentaire"
#: accounting/models.py:193 counter/models.py:238 counter/models.py:281
#: accounting/models.py:196 counter/models.py:238 counter/models.py:281
#: subscription/models.py:57
msgid "payment method"
msgstr "méthode de paiement"
#: accounting/models.py:194
#: accounting/models.py:197
msgid "cheque number"
msgstr "numéro de chèque"
#: accounting/models.py:195 eboutic/models.py:116
#: accounting/models.py:198 eboutic/models.py:116
msgid "invoice"
msgstr "facture"
#: accounting/models.py:196
#: accounting/models.py:199
msgid "is done"
msgstr "est fait"
#: accounting/models.py:198
#: accounting/models.py:201
msgid "simple type"
msgstr "type simplifié"
#: accounting/models.py:200 accounting/models.py:301
#: accounting/models.py:203 accounting/models.py:304
msgid "accounting type"
msgstr "type comptable"
#: accounting/models.py:202 accounting/models.py:296 accounting/models.py:322
#: accounting/models.py:345 counter/models.py:272
#: accounting/models.py:205 accounting/models.py:299 accounting/models.py:325
#: accounting/models.py:348 counter/models.py:272
msgid "label"
msgstr "intitulé"
#: accounting/models.py:203
#: accounting/models.py:206
msgid "target type"
msgstr "type de cible"
#: accounting/models.py:204 club/templates/club/club_members.jinja:8
#: accounting/models.py:207 club/templates/club/club_members.jinja:8
#: club/templates/club/club_old_members.jinja:8
#: core/templates/core/user_clubs.jinja:15
#: core/templates/core/user_clubs.jinja:41
@ -177,36 +177,36 @@ msgstr "type de cible"
msgid "User"
msgstr "Utilisateur"
#: accounting/models.py:204 club/templates/club/club_detail.jinja:5
#: accounting/models.py:207 club/templates/club/club_detail.jinja:5
#: counter/templates/counter/invoices_call.jinja:20
msgid "Club"
msgstr "Club"
#: accounting/models.py:204 core/views/user.py:174
#: accounting/models.py:207 core/views/user.py:174
msgid "Account"
msgstr "Compte"
#: accounting/models.py:204
#: accounting/models.py:207
msgid "Company"
msgstr "Entreprise"
#: accounting/models.py:204 sith/settings.py:291
#: accounting/models.py:207 sith/settings.py:291
msgid "Other"
msgstr "Autre"
#: accounting/models.py:205
#: accounting/models.py:208
msgid "target id"
msgstr "id de la cible"
#: accounting/models.py:206
#: accounting/models.py:209
msgid "target label"
msgstr "nom de la cible"
#: accounting/models.py:207
#: accounting/models.py:210
msgid "linked operation"
msgstr "opération liée"
#: accounting/models.py:223
#: accounting/models.py:226
#, python-format
msgid ""
"The date can not be before the start date of the journal, which is\n"
@ -215,16 +215,16 @@ msgstr ""
"La date ne peut pas être avant la date de début du journal, qui est\n"
"%(start_date)s."
#: accounting/models.py:226
#: accounting/models.py:229
msgid "Target does not exists"
msgstr "La cible n'existe pas."
#: accounting/models.py:228
#: accounting/models.py:231
msgid "Please add a target label if you set no existing target"
msgstr ""
"Merci d'ajouter un nom de cible si vous ne spécifiez pas de cible existante"
#: accounting/models.py:230
#: accounting/models.py:233
msgid ""
"You need to provide ether a simplified accounting type or a standard "
"accounting type"
@ -232,35 +232,35 @@ msgstr ""
"Vous devez fournir soit un type comptable simplifié ou un type comptable "
"standard"
#: accounting/models.py:291 counter/models.py:99
#: accounting/models.py:294 counter/models.py:99
msgid "code"
msgstr "code"
#: accounting/models.py:293
#: accounting/models.py:296
msgid "An accounting type code contains only numbers"
msgstr "Un code comptable ne contient que des numéros"
#: accounting/models.py:297
#: accounting/models.py:300
msgid "movement type"
msgstr "type de mouvement"
#: accounting/models.py:297
#: accounting/models.py:300
msgid "Credit"
msgstr "Crédit"
#: accounting/models.py:297
#: accounting/models.py:300
msgid "Debit"
msgstr "Débit"
#: accounting/models.py:298
#: accounting/models.py:301
msgid "Neutral"
msgstr "Neutre"
#: accounting/models.py:324
#: accounting/models.py:327
msgid "simplified accounting types"
msgstr "type simplifié"
#: accounting/models.py:327
#: accounting/models.py:330
msgid "simplified type"
msgstr "type simplifié"
@ -2468,6 +2468,10 @@ msgstr "Montant du chèque"
msgid "Check quantity"
msgstr "Nombre de chèque"
#: counter/views.py:1061
msgid "people(s)"
msgstr "personne(s)"
#: eboutic/models.py:49
msgid "validated"
msgstr "validé"