Commit 54d3ca8e authored by Skia's avatar Skia

Merge branch 'sli' into 'master'

Edit CONTRIBUTING instructions

See merge request !20
parents 20ff4095 160c7806
Pipeline #348 passed with stage
in 3 minutes and 18 seconds
...@@ -18,19 +18,26 @@ Ensuite, tu fais : ...@@ -18,19 +18,26 @@ Ensuite, tu fais :
Avec cette commande, tu clones le sith AE dans le dossier courant. Avec cette commande, tu clones le sith AE dans le dossier courant.
cd Sith cd Sith
virtualenv --clear --python=python3 env_sith` virtualenv --clear --python=python3 env_sith
source env_sith/bin/activate source env_sith/bin/activate
pip install -r requirements.txt pip install -r requirements.txt
Pour avoir un peu de contenu dans le sith : Maintenant, faut passer le sith en mode debug dans le fichier de settings personnalisé.
python3 manage.py loaddata users groups pages
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` 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. Va, et que l'AE soit avec toi.
Sites et doc cools 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/)
\ No newline at end of file
...@@ -69,7 +69,9 @@ ...@@ -69,7 +69,9 @@
{{ super() }} {{ super() }}
<script> <script>
$(function(){ $(function(){
$("#drop").accordion(); $("#drop").accordion({
heightStyle: "content"
});
}); });
</script> </script>
{% endblock %} {% endblock %}
......
...@@ -1058,7 +1058,7 @@ class EticketPDFView(CanViewMixin, DetailView): ...@@ -1058,7 +1058,7 @@ class EticketPDFView(CanViewMixin, DetailView):
p.setFont("Helvetica-Bold", 16) 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.drawCentredString(10.5 * cm, 22.6 * cm, eticket.event_date.strftime("%d %b %Y")) # FIXME with a locale
p.setFont("Helvetica-Bold", 14) 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) p.setFont("Courier-Bold", 14)
qrcode = QrCodeWidget(code) qrcode = QrCodeWidget(code)
bounds = qrcode.getBounds() bounds = qrcode.getBounds()
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Report-Msgid-Bugs-To: \n" "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" "PO-Revision-Date: 2016-07-18\n"
"Last-Translator: Skia <skia@libskia.so>\n" "Last-Translator: Skia <skia@libskia.so>\n"
"Language-Team: AE info <ae.info@utbm.fr>\n" "Language-Team: AE info <ae.info@utbm.fr>\n"
...@@ -16,8 +16,8 @@ msgstr "" ...@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: accounting/models.py:36 accounting/models.py:55 accounting/models.py:82 #: accounting/models.py:36 accounting/models.py:58 accounting/models.py:85
#: accounting/models.py:141 club/models.py:19 counter/models.py:70 #: accounting/models.py:144 club/models.py:19 counter/models.py:70
#: counter/models.py:95 counter/models.py:130 launderette/models.py:15 #: counter/models.py:95 counter/models.py:130 launderette/models.py:15
#: launderette/models.py:60 launderette/models.py:85 #: launderette/models.py:60 launderette/models.py:85
msgid "name" msgid "name"
...@@ -55,119 +55,119 @@ msgstr "site internet" ...@@ -55,119 +55,119 @@ msgstr "site internet"
msgid "company" msgid "company"
msgstr "entreprise" msgstr "entreprise"
#: accounting/models.py:56 #: accounting/models.py:59
msgid "iban" msgid "iban"
msgstr "IBAN" msgstr "IBAN"
#: accounting/models.py:57 #: accounting/models.py:60
msgid "account number" msgid "account number"
msgstr "numero de compte" 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 #: counter/models.py:104 counter/models.py:131
msgid "club" msgid "club"
msgstr "club" msgstr "club"
#: accounting/models.py:61 #: accounting/models.py:64
msgid "Bank account" msgid "Bank account"
msgstr "Compte en banque" msgstr "Compte en banque"
#: accounting/models.py:84 #: accounting/models.py:87
msgid "bank account" msgid "bank account"
msgstr "compte en banque" msgstr "compte en banque"
#: accounting/models.py:87 #: accounting/models.py:90
msgid "Club account" msgid "Club account"
msgstr "Compte club" msgstr "Compte club"
#: accounting/models.py:132 #: accounting/models.py:135
#, python-format #, python-format
msgid "%(club_account)s on %(bank_account)s" msgid "%(club_account)s on %(bank_account)s"
msgstr "%(club_account)s sur %(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 #: launderette/models.py:122
msgid "start date" msgid "start date"
msgstr "date de début" 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" msgid "end date"
msgstr "date de fin" msgstr "date de fin"
#: accounting/models.py:142 #: accounting/models.py:145
msgid "is closed" msgid "is closed"
msgstr "est fermé" msgstr "est fermé"
#: accounting/models.py:143 accounting/models.py:346 #: accounting/models.py:146 accounting/models.py:349
msgid "club account" msgid "club account"
msgstr "compte club" 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 #: counter/models.py:234
msgid "amount" msgid "amount"
msgstr "montant" msgstr "montant"
#: accounting/models.py:145 #: accounting/models.py:148
msgid "effective_amount" msgid "effective_amount"
msgstr "montant effectif" msgstr "montant effectif"
#: accounting/models.py:148 #: accounting/models.py:151
msgid "General journal" msgid "General journal"
msgstr "Classeur" msgstr "Classeur"
#: accounting/models.py:188 #: accounting/models.py:191
msgid "number" msgid "number"
msgstr "numéro" msgstr "numéro"
#: accounting/models.py:189 #: accounting/models.py:192
msgid "journal" msgid "journal"
msgstr "classeur" 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 #: counter/models.py:237 counter/models.py:280 counter/models.py:397
#: eboutic/models.py:15 eboutic/models.py:48 #: eboutic/models.py:15 eboutic/models.py:48
msgid "date" msgid "date"
msgstr "date" msgstr "date"
#: accounting/models.py:192 counter/models.py:398 #: accounting/models.py:195 counter/models.py:398
msgid "comment" msgid "comment"
msgstr "commentaire" 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 #: subscription/models.py:57
msgid "payment method" msgid "payment method"
msgstr "méthode de paiement" msgstr "méthode de paiement"
#: accounting/models.py:194 #: accounting/models.py:197
msgid "cheque number" msgid "cheque number"
msgstr "numéro de chèque" msgstr "numéro de chèque"
#: accounting/models.py:195 eboutic/models.py:116 #: accounting/models.py:198 eboutic/models.py:116
msgid "invoice" msgid "invoice"
msgstr "facture" msgstr "facture"
#: accounting/models.py:196 #: accounting/models.py:199
msgid "is done" msgid "is done"
msgstr "est fait" msgstr "est fait"
#: accounting/models.py:198 #: accounting/models.py:201
msgid "simple type" msgid "simple type"
msgstr "type simplifié" msgstr "type simplifié"
#: accounting/models.py:200 accounting/models.py:301 #: accounting/models.py:203 accounting/models.py:304
msgid "accounting type" msgid "accounting type"
msgstr "type comptable" msgstr "type comptable"
#: accounting/models.py:202 accounting/models.py:296 accounting/models.py:322 #: accounting/models.py:205 accounting/models.py:299 accounting/models.py:325
#: accounting/models.py:345 counter/models.py:272 #: accounting/models.py:348 counter/models.py:272
msgid "label" msgid "label"
msgstr "intitulé" msgstr "intitulé"
#: accounting/models.py:203 #: accounting/models.py:206
msgid "target type" msgid "target type"
msgstr "type de cible" 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 #: club/templates/club/club_old_members.jinja:8
#: core/templates/core/user_clubs.jinja:15 #: core/templates/core/user_clubs.jinja:15
#: core/templates/core/user_clubs.jinja:41 #: core/templates/core/user_clubs.jinja:41
...@@ -177,36 +177,36 @@ msgstr "type de cible" ...@@ -177,36 +177,36 @@ msgstr "type de cible"
msgid "User" msgid "User"
msgstr "Utilisateur" 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 #: counter/templates/counter/invoices_call.jinja:20
msgid "Club" msgid "Club"
msgstr "Club" msgstr "Club"
#: accounting/models.py:204 core/views/user.py:174 #: accounting/models.py:207 core/views/user.py:174
msgid "Account" msgid "Account"
msgstr "Compte" msgstr "Compte"
#: accounting/models.py:204 #: accounting/models.py:207
msgid "Company" msgid "Company"
msgstr "Entreprise" msgstr "Entreprise"
#: accounting/models.py:204 sith/settings.py:291 #: accounting/models.py:207 sith/settings.py:291
msgid "Other" msgid "Other"
msgstr "Autre" msgstr "Autre"
#: accounting/models.py:205 #: accounting/models.py:208
msgid "target id" msgid "target id"
msgstr "id de la cible" msgstr "id de la cible"
#: accounting/models.py:206 #: accounting/models.py:209
msgid "target label" msgid "target label"
msgstr "nom de la cible" msgstr "nom de la cible"
#: accounting/models.py:207 #: accounting/models.py:210
msgid "linked operation" msgid "linked operation"
msgstr "opération liée" msgstr "opération liée"
#: accounting/models.py:223 #: accounting/models.py:226
#, python-format #, python-format
msgid "" msgid ""
"The date can not be before the start date of the journal, which is\n" "The date can not be before the start date of the journal, which is\n"
...@@ -215,16 +215,16 @@ msgstr "" ...@@ -215,16 +215,16 @@ msgstr ""
"La date ne peut pas être avant la date de début du journal, qui est\n" "La date ne peut pas être avant la date de début du journal, qui est\n"
"%(start_date)s." "%(start_date)s."
#: accounting/models.py:226 #: accounting/models.py:229
msgid "Target does not exists" msgid "Target does not exists"
msgstr "La cible n'existe pas." 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" msgid "Please add a target label if you set no existing target"
msgstr "" msgstr ""
"Merci d'ajouter un nom de cible si vous ne spécifiez pas de cible existante" "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 "" msgid ""
"You need to provide ether a simplified accounting type or a standard " "You need to provide ether a simplified accounting type or a standard "
"accounting type" "accounting type"
...@@ -232,35 +232,35 @@ msgstr "" ...@@ -232,35 +232,35 @@ msgstr ""
"Vous devez fournir soit un type comptable simplifié ou un type comptable " "Vous devez fournir soit un type comptable simplifié ou un type comptable "
"standard" "standard"
#: accounting/models.py:291 counter/models.py:99 #: accounting/models.py:294 counter/models.py:99
msgid "code" msgid "code"
msgstr "code" msgstr "code"
#: accounting/models.py:293 #: accounting/models.py:296
msgid "An accounting type code contains only numbers" msgid "An accounting type code contains only numbers"
msgstr "Un code comptable ne contient que des numéros" msgstr "Un code comptable ne contient que des numéros"
#: accounting/models.py:297 #: accounting/models.py:300
msgid "movement type" msgid "movement type"
msgstr "type de mouvement" msgstr "type de mouvement"
#: accounting/models.py:297 #: accounting/models.py:300
msgid "Credit" msgid "Credit"
msgstr "Crédit" msgstr "Crédit"
#: accounting/models.py:297 #: accounting/models.py:300
msgid "Debit" msgid "Debit"
msgstr "Débit" msgstr "Débit"
#: accounting/models.py:298 #: accounting/models.py:301
msgid "Neutral" msgid "Neutral"
msgstr "Neutre" msgstr "Neutre"
#: accounting/models.py:324 #: accounting/models.py:327
msgid "simplified accounting types" msgid "simplified accounting types"
msgstr "type simplifié" msgstr "type simplifié"
#: accounting/models.py:327 #: accounting/models.py:330
msgid "simplified type" msgid "simplified type"
msgstr "type simplifié" msgstr "type simplifié"
...@@ -2468,6 +2468,10 @@ msgstr "Montant du chèque" ...@@ -2468,6 +2468,10 @@ msgstr "Montant du chèque"
msgid "Check quantity" msgid "Check quantity"
msgstr "Nombre de chèque" msgstr "Nombre de chèque"
#: counter/views.py:1061
msgid "people(s)"
msgstr "personne(s)"
#: eboutic/models.py:49 #: eboutic/models.py:49
msgid "validated" msgid "validated"
msgstr "validé" msgstr "validé"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment