mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-11-24 20:33:11 +00:00
Harmonize verbose_name in cotisations
This commit is contained in:
Alexandre Iooss
parent
6f8df95fa6
commit
91f5d6a92e
7 changed files with 281 additions and 146 deletions
|
|
@ -37,7 +37,7 @@ msgstr "Vous n'avez pas le droit de voir cette application."
|
|||
msgid "Select a payment method"
|
||||
msgstr "Sélectionnez un moyen de paiement"
|
||||
|
||||
#: cotisations/forms.py:69 cotisations/models.py:602
|
||||
#: cotisations/forms.py:69 cotisations/models.py:603
|
||||
msgid "Member"
|
||||
msgstr "Adhérent"
|
||||
|
||||
|
|
@ -126,23 +126,19 @@ msgstr ""
|
|||
"Le montant demandé est trop grand. Votre solde ne peut excéder "
|
||||
"%(max_online_balance)s €."
|
||||
|
||||
#: cotisations/models.py:63
|
||||
#: cotisations/templates/cotisations/aff_cost_estimate.html:46
|
||||
#: cotisations/templates/cotisations/aff_cotisations.html:48
|
||||
#: cotisations/templates/cotisations/aff_custom_invoice.html:46
|
||||
#: cotisations/templates/cotisations/control.html:70
|
||||
msgid "Date"
|
||||
msgstr "Date"
|
||||
#: cotisations/models.py:62
|
||||
msgid "date"
|
||||
msgstr "date"
|
||||
|
||||
#: cotisations/models.py:139
|
||||
#: cotisations/models.py:137
|
||||
msgid "cheque number"
|
||||
msgstr "numéro de chèque"
|
||||
|
||||
#: cotisations/models.py:144
|
||||
#: cotisations/models.py:143
|
||||
msgid "validated"
|
||||
msgstr "validée"
|
||||
|
||||
#: cotisations/models.py:149
|
||||
#: cotisations/models.py:148
|
||||
msgid "controlled"
|
||||
msgstr "contrôlée"
|
||||
|
||||
|
|
@ -224,37 +220,33 @@ msgstr "Il n'y a pas d'article que vous puissiez acheter."
|
|||
msgid "Can view a custom invoice object"
|
||||
msgstr "Peut voir un objet facture personnalisée"
|
||||
|
||||
#: cotisations/models.py:299
|
||||
#: cotisations/templates/cotisations/aff_cost_estimate.html:36
|
||||
#: cotisations/templates/cotisations/aff_custom_invoice.html:36
|
||||
msgid "Recipient"
|
||||
msgstr "Destinataire"
|
||||
#: cotisations/models.py:298
|
||||
msgid "recipient"
|
||||
msgstr "destinataire"
|
||||
|
||||
#: cotisations/models.py:303
|
||||
#: cotisations/templates/cotisations/aff_paiement.html:33
|
||||
msgid "Payment type"
|
||||
msgstr "Type de paiement"
|
||||
#: cotisations/models.py:302
|
||||
msgid "payment type"
|
||||
msgstr "type de paiement"
|
||||
|
||||
#: cotisations/models.py:307
|
||||
msgid "Address"
|
||||
msgstr "Adresse"
|
||||
#: cotisations/models.py:306
|
||||
msgid "address"
|
||||
msgstr "adresse"
|
||||
|
||||
#: cotisations/models.py:310
|
||||
#: cotisations/templates/cotisations/aff_custom_invoice.html:54
|
||||
msgid "Paid"
|
||||
msgstr "Payé"
|
||||
msgid "paid"
|
||||
msgstr "payé"
|
||||
|
||||
#: cotisations/models.py:314
|
||||
msgid "Remark"
|
||||
msgstr "Remarque"
|
||||
msgid "remark"
|
||||
msgstr "remarque"
|
||||
|
||||
#: cotisations/models.py:323
|
||||
msgid "Can view a cost estimate object"
|
||||
msgstr "Peut voir un objet devis"
|
||||
|
||||
#: cotisations/models.py:326
|
||||
msgid "Period of validity"
|
||||
msgstr "Période de validité"
|
||||
msgid "period of validity"
|
||||
msgstr "période de validité"
|
||||
|
||||
#: cotisations/models.py:363
|
||||
msgid "You don't have the right to delete a cost estimate."
|
||||
|
|
@ -264,71 +256,71 @@ msgstr "Vous n'avez pas le droit de supprimer un devis."
|
|||
msgid "The cost estimate has an invoice and can't be deleted."
|
||||
msgstr "Le devis a une facture et ne peut pas être supprimé."
|
||||
|
||||
#: cotisations/models.py:387 cotisations/models.py:608
|
||||
#: cotisations/models.py:875
|
||||
#: cotisations/models.py:387 cotisations/models.py:609
|
||||
#: cotisations/models.py:877
|
||||
msgid "Connection"
|
||||
msgstr "Connexion"
|
||||
|
||||
#: cotisations/models.py:388 cotisations/models.py:609
|
||||
#: cotisations/models.py:876
|
||||
#: cotisations/models.py:388 cotisations/models.py:610
|
||||
#: cotisations/models.py:878
|
||||
msgid "Membership"
|
||||
msgstr "Adhésion"
|
||||
|
||||
#: cotisations/models.py:389 cotisations/models.py:604
|
||||
#: cotisations/models.py:610 cotisations/models.py:877
|
||||
#: cotisations/models.py:389 cotisations/models.py:605
|
||||
#: cotisations/models.py:611 cotisations/models.py:879
|
||||
msgid "Both of them"
|
||||
msgstr "Les deux"
|
||||
|
||||
#: cotisations/models.py:401
|
||||
#: cotisations/models.py:400
|
||||
msgid "amount"
|
||||
msgstr "montant"
|
||||
|
||||
#: cotisations/models.py:406
|
||||
#: cotisations/models.py:405
|
||||
msgid "article"
|
||||
msgstr "article"
|
||||
|
||||
#: cotisations/models.py:413
|
||||
#: cotisations/models.py:411
|
||||
msgid "price"
|
||||
msgstr "prix"
|
||||
|
||||
#: cotisations/models.py:418 cotisations/models.py:627
|
||||
#: cotisations/models.py:417 cotisations/models.py:625
|
||||
msgid "duration (in months)"
|
||||
msgstr "durée (en mois)"
|
||||
|
||||
#: cotisations/models.py:426 cotisations/models.py:641
|
||||
#: cotisations/models.py:891
|
||||
#: cotisations/models.py:423 cotisations/models.py:637
|
||||
#: cotisations/models.py:889
|
||||
msgid "subscription type"
|
||||
msgstr "type de cotisation"
|
||||
|
||||
#: cotisations/models.py:431
|
||||
#: cotisations/models.py:432
|
||||
msgid "Can view a purchase object"
|
||||
msgstr "Peut voir un objet achat"
|
||||
|
||||
#: cotisations/models.py:432
|
||||
#: cotisations/models.py:433
|
||||
msgid "Can edit all the previous purchases"
|
||||
msgstr "Peut modifier tous les achats précédents"
|
||||
|
||||
#: cotisations/models.py:434 cotisations/models.py:885
|
||||
#: cotisations/models.py:435
|
||||
msgid "purchase"
|
||||
msgstr "achat"
|
||||
|
||||
#: cotisations/models.py:435
|
||||
#: cotisations/models.py:436
|
||||
msgid "purchases"
|
||||
msgstr "achats"
|
||||
|
||||
#: cotisations/models.py:502 cotisations/models.py:665
|
||||
#: cotisations/models.py:503 cotisations/models.py:666
|
||||
msgid "Duration must be specified for a subscription."
|
||||
msgstr "La durée de la cotisation doit être indiquée."
|
||||
|
||||
#: cotisations/models.py:509
|
||||
#: cotisations/models.py:510
|
||||
msgid "You don't have the right to edit the purchases."
|
||||
msgstr "Vous n'avez pas le droit de modifier les achats."
|
||||
|
||||
#: cotisations/models.py:514
|
||||
#: cotisations/models.py:515
|
||||
msgid "You don't have the right to edit this user's purchases."
|
||||
msgstr "Vous n'avez pas le droit de modifier les achats de cet utilisateur."
|
||||
|
||||
#: cotisations/models.py:518
|
||||
#: cotisations/models.py:519
|
||||
msgid ""
|
||||
"You don't have the right to edit a purchase already controlled or "
|
||||
"invalidated."
|
||||
|
|
@ -336,15 +328,15 @@ msgstr ""
|
|||
"Vous n'avez pas le droit de modifier un achat précédemment contrôlé ou "
|
||||
"invalidé."
|
||||
|
||||
#: cotisations/models.py:525
|
||||
#: cotisations/models.py:526
|
||||
msgid "You don't have the right to delete a purchase."
|
||||
msgstr "Vous n'avez pas le droit de supprimer un achat."
|
||||
|
||||
#: cotisations/models.py:527
|
||||
#: cotisations/models.py:528
|
||||
msgid "You don't have the right to delete this user's purchases."
|
||||
msgstr "Vous n'avez pas le droit de supprimer les achats de cet utilisateur."
|
||||
|
||||
#: cotisations/models.py:530
|
||||
#: cotisations/models.py:531
|
||||
msgid ""
|
||||
"You don't have the right to delete a purchase already controlled or "
|
||||
"invalidated."
|
||||
|
|
@ -352,13 +344,13 @@ msgstr ""
|
|||
"Vous n'avez pas le droit de supprimer un achat précédemment contrôlé ou "
|
||||
"invalidé."
|
||||
|
||||
#: cotisations/models.py:538
|
||||
#: cotisations/models.py:539
|
||||
msgid "You don't have the right to view someone else's purchase history."
|
||||
msgstr ""
|
||||
"Vous n'avez pas le droit de voir l'historique des achats d'un autre "
|
||||
"utilisateur."
|
||||
|
||||
#: cotisations/models.py:603
|
||||
#: cotisations/models.py:604
|
||||
msgid "Club"
|
||||
msgstr "Club"
|
||||
|
||||
|
|
@ -366,47 +358,51 @@ msgstr "Club"
|
|||
msgid "designation"
|
||||
msgstr "désignation"
|
||||
|
||||
#: cotisations/models.py:621
|
||||
#: cotisations/models.py:620
|
||||
msgid "unit price"
|
||||
msgstr "prix unitaire"
|
||||
|
||||
#: cotisations/models.py:633
|
||||
#: cotisations/models.py:631
|
||||
msgid "type of users concerned"
|
||||
msgstr "type d'utilisateurs concernés"
|
||||
|
||||
#: cotisations/models.py:645 cotisations/models.py:756
|
||||
#: cotisations/models.py:645 cotisations/models.py:757
|
||||
msgid "is available for every user"
|
||||
msgstr "est disponible pour chaque utilisateur"
|
||||
|
||||
#: cotisations/models.py:652
|
||||
#: cotisations/models.py:653
|
||||
msgid "Can view an article object"
|
||||
msgstr "Peut voir un objet article"
|
||||
|
||||
#: cotisations/models.py:653
|
||||
#: cotisations/models.py:654
|
||||
msgid "Can buy every article"
|
||||
msgstr "Peut acheter chaque article"
|
||||
|
||||
#: cotisations/models.py:661
|
||||
#: cotisations/models.py:662
|
||||
msgid "Balance is a reserved article name."
|
||||
msgstr "Solde est un nom d'article réservé."
|
||||
|
||||
#: cotisations/models.py:686
|
||||
#: cotisations/models.py:687
|
||||
msgid "You can't buy this article."
|
||||
msgstr "Vous ne pouvez pas acheter cet article."
|
||||
|
||||
#: cotisations/models.py:731
|
||||
#: cotisations/models.py:727
|
||||
msgid "name"
|
||||
msgstr "nom"
|
||||
|
||||
#: cotisations/models.py:733
|
||||
msgid "Can view a bank object"
|
||||
msgstr "Peut voir un objet banque"
|
||||
|
||||
#: cotisations/models.py:733
|
||||
#: cotisations/models.py:735
|
||||
msgid "bank"
|
||||
msgstr "banque"
|
||||
|
||||
#: cotisations/models.py:734
|
||||
#: cotisations/models.py:736
|
||||
msgid "banks"
|
||||
msgstr "banques"
|
||||
|
||||
#: cotisations/models.py:752
|
||||
#: cotisations/models.py:753
|
||||
msgid "method"
|
||||
msgstr "moyen"
|
||||
|
||||
|
|
@ -414,72 +410,72 @@ msgstr "moyen"
|
|||
msgid "is user balance"
|
||||
msgstr "est solde utilisateur"
|
||||
|
||||
#: cotisations/models.py:762
|
||||
#: cotisations/models.py:764
|
||||
msgid "There should be only one balance payment method."
|
||||
msgstr "Il ne devrait y avoir qu'un moyen de paiement solde."
|
||||
|
||||
#: cotisations/models.py:768
|
||||
#: cotisations/models.py:770
|
||||
msgid "Can view a payment method object"
|
||||
msgstr "Peut voir un objet moyen de paiement"
|
||||
|
||||
#: cotisations/models.py:769
|
||||
#: cotisations/models.py:771
|
||||
msgid "Can use every payment method"
|
||||
msgstr "Peut utiliser chaque moyen de paiement"
|
||||
|
||||
#: cotisations/models.py:771
|
||||
#: cotisations/models.py:773
|
||||
msgid "payment method"
|
||||
msgstr "moyen de paiement"
|
||||
|
||||
#: cotisations/models.py:772
|
||||
#: cotisations/models.py:774
|
||||
msgid "payment methods"
|
||||
msgstr "moyens de paiement"
|
||||
|
||||
#: cotisations/models.py:810 cotisations/payment_methods/comnpay/views.py:63
|
||||
#: cotisations/models.py:812 cotisations/payment_methods/comnpay/views.py:63
|
||||
#, python-format
|
||||
msgid "The subscription of %(member_name)s was extended to %(end_date)s."
|
||||
msgstr "La cotisation de %(member_name)s a été étendue au %(end_date)s."
|
||||
|
||||
#: cotisations/models.py:820
|
||||
#: cotisations/models.py:822
|
||||
msgid "The invoice was created."
|
||||
msgstr "La facture a été créée."
|
||||
|
||||
#: cotisations/models.py:841
|
||||
#: cotisations/models.py:843
|
||||
msgid "You can't use this payment method."
|
||||
msgstr "Vous ne pouvez pas utiliser ce moyen de paiement."
|
||||
|
||||
#: cotisations/models.py:859
|
||||
#: cotisations/models.py:861
|
||||
msgid "No custom payment method."
|
||||
msgstr "Pas de moyen de paiement personnalisé."
|
||||
|
||||
#: cotisations/models.py:894
|
||||
#: cotisations/models.py:895
|
||||
msgid "start date"
|
||||
msgstr "date de début"
|
||||
|
||||
#: cotisations/models.py:897
|
||||
#: cotisations/models.py:898
|
||||
msgid "end date"
|
||||
msgstr "date de fin"
|
||||
|
||||
#: cotisations/models.py:902
|
||||
#: cotisations/models.py:903
|
||||
msgid "Can view a subscription object"
|
||||
msgstr "Peut voir un objet cotisation"
|
||||
|
||||
#: cotisations/models.py:903
|
||||
#: cotisations/models.py:904
|
||||
msgid "Can edit the previous subscriptions"
|
||||
msgstr "Peut modifier les cotisations précédentes"
|
||||
|
||||
#: cotisations/models.py:905
|
||||
#: cotisations/models.py:906
|
||||
msgid "subscription"
|
||||
msgstr "cotisation"
|
||||
|
||||
#: cotisations/models.py:906
|
||||
#: cotisations/models.py:907
|
||||
msgid "subscriptions"
|
||||
msgstr "cotisations"
|
||||
|
||||
#: cotisations/models.py:910
|
||||
#: cotisations/models.py:911
|
||||
msgid "You don't have the right to edit a subscription."
|
||||
msgstr "Vous n'avez pas le droit de modifier une cotisation."
|
||||
|
||||
#: cotisations/models.py:914
|
||||
#: cotisations/models.py:915
|
||||
msgid ""
|
||||
"You don't have the right to edit a subscription already controlled or "
|
||||
"invalidated."
|
||||
|
|
@ -487,11 +483,11 @@ msgstr ""
|
|||
"Vous n'avez pas le droit de modifier une cotisation précédemment contrôlée "
|
||||
"ou invalidée."
|
||||
|
||||
#: cotisations/models.py:921
|
||||
#: cotisations/models.py:922
|
||||
msgid "You don't have the right to delete a subscription."
|
||||
msgstr "Vous n'avez pas le droit de supprimer une cotisation."
|
||||
|
||||
#: cotisations/models.py:924
|
||||
#: cotisations/models.py:925
|
||||
msgid ""
|
||||
"You don't have the right to delete a subscription already controlled or "
|
||||
"invalidated."
|
||||
|
|
@ -499,7 +495,7 @@ msgstr ""
|
|||
"Vous n'avez pas le droit de supprimer une cotisation précédemment contrôlée "
|
||||
"ou invalidée."
|
||||
|
||||
#: cotisations/models.py:932
|
||||
#: cotisations/models.py:933
|
||||
msgid "You don't have the right to view someone else's subscription history."
|
||||
msgstr ""
|
||||
"Vous n'avez pas le droit de voir l'historique des cotisations d'un autre "
|
||||
|
|
@ -510,8 +506,8 @@ msgid "user balance"
|
|||
msgstr "solde utilisateur"
|
||||
|
||||
#: cotisations/payment_methods/balance/models.py:47
|
||||
msgid "Minimum balance"
|
||||
msgstr "Solde minimum"
|
||||
msgid "minimum balance"
|
||||
msgstr "solde minimum"
|
||||
|
||||
#: cotisations/payment_methods/balance/models.py:48
|
||||
msgid ""
|
||||
|
|
@ -522,16 +518,16 @@ msgstr ""
|
|||
"Vous pouvez renseigner un montant négatif."
|
||||
|
||||
#: cotisations/payment_methods/balance/models.py:57
|
||||
msgid "Maximum balance"
|
||||
msgstr "Solde maximum"
|
||||
msgid "maximum balance"
|
||||
msgstr "solde maximum"
|
||||
|
||||
#: cotisations/payment_methods/balance/models.py:58
|
||||
msgid "The maximal amount of money allowed for the balance."
|
||||
msgstr "Le montant maximal d'argent autorisé pour le solde."
|
||||
|
||||
#: cotisations/payment_methods/balance/models.py:66
|
||||
msgid "Allow user to credit their balance"
|
||||
msgstr "Autorise l'utilisateur à créditer son solde"
|
||||
msgid "allow user to credit their balance"
|
||||
msgstr "autorise l'utilisateur à créditer son solde"
|
||||
|
||||
#: cotisations/payment_methods/balance/models.py:79
|
||||
#: cotisations/payment_methods/balance/models.py:110
|
||||
|
|
@ -544,8 +540,8 @@ msgid "There is already a payment method for user balance."
|
|||
msgstr "Il y a déjà un moyen de paiement pour le solde utilisateur."
|
||||
|
||||
#: cotisations/payment_methods/cheque/models.py:36
|
||||
msgid "Cheque"
|
||||
msgstr "Chèque"
|
||||
msgid "cheque"
|
||||
msgstr "chèque"
|
||||
|
||||
#: cotisations/payment_methods/cheque/views.py:47
|
||||
msgid "You can't pay this invoice with a cheque."
|
||||
|
|
@ -555,32 +551,38 @@ msgstr "Vous ne pouvez pas payer cette facture avec un chèque."
|
|||
msgid "ComNpay"
|
||||
msgstr "ComNpay"
|
||||
|
||||
#: cotisations/payment_methods/comnpay/models.py:51
|
||||
#: cotisations/payment_methods/comnpay/models.py:48
|
||||
msgid "ComNpay VAT Number"
|
||||
msgstr "Numéro de TVA de ComNpay"
|
||||
|
||||
#: cotisations/payment_methods/comnpay/models.py:57
|
||||
#: cotisations/payment_methods/comnpay/models.py:54
|
||||
msgid "ComNpay secret key"
|
||||
msgstr "Clé secrète de ComNpay"
|
||||
|
||||
#: cotisations/payment_methods/comnpay/models.py:60
|
||||
msgid "Minimum payment"
|
||||
msgstr "Paiement minimum"
|
||||
msgid "minimum payment"
|
||||
msgstr "paiement minimum"
|
||||
|
||||
#: cotisations/payment_methods/comnpay/models.py:61
|
||||
msgid "The minimal amount of money you have to use when paying with ComNpay"
|
||||
msgstr ""
|
||||
"Le montant minimal d'agent que vous devez utiliser en payant avec ComNpay"
|
||||
|
||||
#: cotisations/payment_methods/comnpay/models.py:69
|
||||
msgid "Production mode enabled (production URL, instead of homologation)"
|
||||
msgstr "Mode production activé (URL de production, au lieu d'homologation)"
|
||||
#: cotisations/payment_methods/comnpay/models.py:68
|
||||
msgid "Production mode"
|
||||
msgstr "Mode production"
|
||||
|
||||
#: cotisations/payment_methods/comnpay/models.py:102
|
||||
#: cotisations/payment_methods/comnpay/models.py:69
|
||||
msgid "When enabled it will use production URL instead of homologation"
|
||||
msgstr
|
||||
"Quand activé, l'URL de production sera utilisée au lieu de celle "
|
||||
"d'homologation"
|
||||
|
||||
#: cotisations/payment_methods/comnpay/models.py:104
|
||||
msgid "Pay invoice number "
|
||||
msgstr "Payer la facture numéro "
|
||||
|
||||
#: cotisations/payment_methods/comnpay/models.py:114
|
||||
#: cotisations/payment_methods/comnpay/models.py:116
|
||||
msgid ""
|
||||
"In order to pay your invoice with ComNpay, the price must be greater than {} "
|
||||
"€."
|
||||
|
|
@ -624,10 +626,18 @@ msgstr "Mot de passe"
|
|||
msgid "NoteKfet"
|
||||
msgstr "NoteKfet"
|
||||
|
||||
#: cotisations/payment_methods/note_kfet/models.py:50
|
||||
#: cotisations/payment_methods/note_kfet/models.py:49
|
||||
msgid "server"
|
||||
msgstr "serveur"
|
||||
|
||||
#: cotisations/payment_methods/note_kfet/models.py:53
|
||||
msgid "port"
|
||||
msgstr "port"
|
||||
|
||||
#: cotisations/payment_methods/note_kfet/models.py:58
|
||||
msgid "id of destination note"
|
||||
msgstr "id de la note de destination"
|
||||
|
||||
#: cotisations/payment_methods/note_kfet/views.py:60
|
||||
msgid "Unknown error."
|
||||
msgstr "Erreur inconnue."
|
||||
|
|
@ -660,6 +670,11 @@ msgstr "Disponible pour tous"
|
|||
msgid "Bank"
|
||||
msgstr "Banque"
|
||||
|
||||
#: cotisations/templates/cotisations/aff_cost_estimate.html:36
|
||||
#: cotisations/templates/cotisations/aff_custom_invoice.html:36
|
||||
msgid "Recipient"
|
||||
msgstr "Destinataire"
|
||||
|
||||
#: cotisations/templates/cotisations/aff_cost_estimate.html:39
|
||||
#: cotisations/templates/cotisations/aff_cotisations.html:41
|
||||
#: cotisations/templates/cotisations/aff_custom_invoice.html:39
|
||||
|
|
@ -675,6 +690,13 @@ msgstr "Désignation"
|
|||
msgid "Total price"
|
||||
msgstr "Prix total"
|
||||
|
||||
#: cotisations/templates/cotisations/aff_cost_estimate.html:46
|
||||
#: cotisations/templates/cotisations/aff_cotisations.html:48
|
||||
#: cotisations/templates/cotisations/aff_custom_invoice.html:46
|
||||
#: cotisations/templates/cotisations/control.html:70
|
||||
msgid "Date"
|
||||
msgstr "Date"
|
||||
|
||||
#: cotisations/templates/cotisations/aff_cost_estimate.html:50
|
||||
msgid "Validity"
|
||||
msgstr "Validité"
|
||||
|
|
@ -715,6 +737,14 @@ msgstr "Facture invalidée"
|
|||
msgid "Voucher"
|
||||
msgstr ""
|
||||
|
||||
#: cotisations/templates/cotisations/aff_custom_invoice.html:54
|
||||
msgid "Paid"
|
||||
msgstr "Payé"
|
||||
|
||||
#: cotisations/templates/cotisations/aff_paiement.html:33
|
||||
msgid "Payment type"
|
||||
msgstr "Type de paiement"
|
||||
|
||||
#: cotisations/templates/cotisations/aff_paiement.html:34
|
||||
msgid "Is available for everyone"
|
||||
msgstr "Est disponible pour tous"
|
||||
|
|
|
|||
100
cotisations/migrations/0039_auto_20190321_1626.py
Normal file
100
cotisations/migrations/0039_auto_20190321_1626.py
Normal file
|
|
@ -0,0 +1,100 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.10.7 on 2019-03-21 15:26
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('cotisations', '0038_auto_20181231_1657'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterModelOptions(
|
||||
name='chequepayment',
|
||||
options={'verbose_name': 'cheque'},
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='balancepayment',
|
||||
name='credit_balance_allowed',
|
||||
field=models.BooleanField(default=False, verbose_name='allow user to credit their balance'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='balancepayment',
|
||||
name='maximum_balance',
|
||||
field=models.DecimalField(blank=True, decimal_places=2, default=50, help_text='The maximal amount of money allowed for the balance.', max_digits=5, null=True, verbose_name='maximum balance'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='balancepayment',
|
||||
name='minimum_balance',
|
||||
field=models.DecimalField(decimal_places=2, default=0, help_text='The minimal amount of money allowed for the balance at the end of a payment. You can specify negative amount.', max_digits=5, verbose_name='minimum balance'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='banque',
|
||||
name='name',
|
||||
field=models.CharField(max_length=255, verbose_name='name'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='baseinvoice',
|
||||
name='date',
|
||||
field=models.DateTimeField(auto_now_add=True, verbose_name='date'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='comnpaypayment',
|
||||
name='minimum_payment',
|
||||
field=models.DecimalField(decimal_places=2, default=1, help_text='The minimal amount of money you have to use when paying with ComNpay', max_digits=5, verbose_name='minimum payment'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='comnpaypayment',
|
||||
name='production',
|
||||
field=models.BooleanField(default=True, help_text='When enabled it will use production URL instead of homologation', verbose_name='Production mode'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='costestimate',
|
||||
name='validity',
|
||||
field=models.DurationField(help_text='DD HH:MM:SS', verbose_name='period of validity'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='cotisation',
|
||||
name='vente',
|
||||
field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, to='cotisations.Vente'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='custominvoice',
|
||||
name='address',
|
||||
field=models.CharField(max_length=255, verbose_name='address'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='custominvoice',
|
||||
name='paid',
|
||||
field=models.BooleanField(default=False, verbose_name='paid'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='custominvoice',
|
||||
name='payment',
|
||||
field=models.CharField(max_length=255, verbose_name='payment type'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='custominvoice',
|
||||
name='recipient',
|
||||
field=models.CharField(max_length=255, verbose_name='recipient'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='custominvoice',
|
||||
name='remark',
|
||||
field=models.TextField(blank=True, null=True, verbose_name='remark'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='notepayment',
|
||||
name='id_note',
|
||||
field=models.PositiveIntegerField(blank=True, null=True, verbose_name='id of destination note'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='notepayment',
|
||||
name='port',
|
||||
field=models.PositiveIntegerField(blank=True, null=True, verbose_name='port'),
|
||||
),
|
||||
]
|
||||
|
|
@ -59,8 +59,8 @@ from cotisations.validators import check_no_balance
|
|||
|
||||
class BaseInvoice(RevMixin, AclMixin, FieldPermissionModelMixin, models.Model):
|
||||
date = models.DateTimeField(
|
||||
verbose_name=_("date"),
|
||||
auto_now_add=True,
|
||||
verbose_name=_("Date")
|
||||
)
|
||||
|
||||
# TODO : change prix to price
|
||||
|
|
@ -134,19 +134,19 @@ class Facture(BaseInvoice):
|
|||
)
|
||||
# TODO : maybe change to cheque nummber because not evident
|
||||
cheque = models.CharField(
|
||||
verbose_name=_("cheque number"),
|
||||
max_length=255,
|
||||
blank=True,
|
||||
verbose_name=_("cheque number")
|
||||
)
|
||||
# TODO : change name to validity for clarity
|
||||
valid = models.BooleanField(
|
||||
verbose_name=_("validated"),
|
||||
default=False,
|
||||
verbose_name=_("validated")
|
||||
)
|
||||
# TODO : changed name to controlled for clarity
|
||||
control = models.BooleanField(
|
||||
verbose_name=_("controlled"),
|
||||
default=False,
|
||||
verbose_name=_("controlled")
|
||||
)
|
||||
|
||||
class Meta:
|
||||
|
|
@ -295,23 +295,23 @@ class CustomInvoice(BaseInvoice):
|
|||
('view_custominvoice', _("Can view a custom invoice object")),
|
||||
)
|
||||
recipient = models.CharField(
|
||||
verbose_name=_("recipient"),
|
||||
max_length=255,
|
||||
verbose_name=_("Recipient")
|
||||
)
|
||||
payment = models.CharField(
|
||||
verbose_name=_("payment type"),
|
||||
max_length=255,
|
||||
verbose_name=_("Payment type")
|
||||
)
|
||||
address = models.CharField(
|
||||
verbose_name=_("address"),
|
||||
max_length=255,
|
||||
verbose_name=_("Address")
|
||||
)
|
||||
paid = models.BooleanField(
|
||||
verbose_name=_("Paid"),
|
||||
verbose_name=_("paid"),
|
||||
default=False
|
||||
)
|
||||
remark = models.TextField(
|
||||
verbose_name=_("Remark"),
|
||||
verbose_name=_("remark"),
|
||||
blank=True,
|
||||
null=True
|
||||
)
|
||||
|
|
@ -323,7 +323,7 @@ class CostEstimate(CustomInvoice):
|
|||
('view_costestimate', _("Can view a cost estimate object")),
|
||||
)
|
||||
validity = models.DurationField(
|
||||
verbose_name=_("Period of validity"),
|
||||
verbose_name=_("period of validity"),
|
||||
help_text="DD HH:MM:SS"
|
||||
)
|
||||
final_invoice = models.ForeignKey(
|
||||
|
|
@ -397,33 +397,34 @@ class Vente(RevMixin, AclMixin, models.Model):
|
|||
)
|
||||
# TODO : change number to amount for clarity
|
||||
number = models.IntegerField(
|
||||
verbose_name=_("amount"),
|
||||
validators=[MinValueValidator(1)],
|
||||
verbose_name=_("amount")
|
||||
)
|
||||
# TODO : change this field for a ForeinKey to Article
|
||||
name = models.CharField(
|
||||
verbose_name=_("article"),
|
||||
max_length=255,
|
||||
verbose_name=_("article")
|
||||
)
|
||||
# TODO : change prix to price
|
||||
# TODO : this field is not needed if you use Article ForeignKey
|
||||
prix = models.DecimalField(
|
||||
verbose_name=_("price"),
|
||||
max_digits=5,
|
||||
decimal_places=2,
|
||||
verbose_name=_("price"))
|
||||
)
|
||||
# TODO : this field is not needed if you use Article ForeignKey
|
||||
duration = models.PositiveIntegerField(
|
||||
verbose_name=_("duration (in months)"),
|
||||
blank=True,
|
||||
null=True,
|
||||
verbose_name=_("duration (in months)")
|
||||
)
|
||||
# TODO : this field is not needed if you use Article ForeignKey
|
||||
type_cotisation = models.CharField(
|
||||
verbose_name=_("subscription type"),
|
||||
choices=COTISATION_TYPE,
|
||||
blank=True,
|
||||
null=True,
|
||||
max_length=255,
|
||||
verbose_name=_("subscription type")
|
||||
)
|
||||
|
||||
class Meta:
|
||||
|
|
@ -611,38 +612,38 @@ class Article(RevMixin, AclMixin, models.Model):
|
|||
)
|
||||
|
||||
name = models.CharField(
|
||||
verbose_name=_("designation"),
|
||||
max_length=255,
|
||||
verbose_name=_("designation")
|
||||
)
|
||||
# TODO : change prix to price
|
||||
prix = models.DecimalField(
|
||||
verbose_name=_("unit price"),
|
||||
max_digits=5,
|
||||
decimal_places=2,
|
||||
verbose_name=_("unit price")
|
||||
)
|
||||
duration = models.PositiveIntegerField(
|
||||
verbose_name=_("duration (in months)"),
|
||||
blank=True,
|
||||
null=True,
|
||||
validators=[MinValueValidator(0)],
|
||||
verbose_name=_("duration (in months)")
|
||||
)
|
||||
type_user = models.CharField(
|
||||
verbose_name=_("type of users concerned"),
|
||||
choices=USER_TYPES,
|
||||
default='All',
|
||||
max_length=255,
|
||||
verbose_name=_("type of users concerned")
|
||||
)
|
||||
type_cotisation = models.CharField(
|
||||
verbose_name=_("subscription type"),
|
||||
choices=COTISATION_TYPE,
|
||||
default=None,
|
||||
blank=True,
|
||||
null=True,
|
||||
max_length=255,
|
||||
verbose_name=_("subscription type")
|
||||
)
|
||||
available_for_everyone = models.BooleanField(
|
||||
verbose_name=_("is available for every user"),
|
||||
default=False,
|
||||
verbose_name=_("is available for every user")
|
||||
)
|
||||
|
||||
unique_together = ('name', 'type_user')
|
||||
|
|
@ -723,6 +724,7 @@ class Banque(RevMixin, AclMixin, models.Model):
|
|||
"""
|
||||
|
||||
name = models.CharField(
|
||||
verbose_name=_("name"),
|
||||
max_length=255,
|
||||
)
|
||||
|
||||
|
|
@ -748,17 +750,17 @@ class Paiement(RevMixin, AclMixin, models.Model):
|
|||
|
||||
# TODO : change moyen to method
|
||||
moyen = models.CharField(
|
||||
verbose_name=_("method"),
|
||||
max_length=255,
|
||||
verbose_name=_("method")
|
||||
)
|
||||
available_for_everyone = models.BooleanField(
|
||||
verbose_name=_("is available for every user"),
|
||||
default=False,
|
||||
verbose_name=_("is available for every user")
|
||||
)
|
||||
is_balance = models.BooleanField(
|
||||
verbose_name=_("is user balance"),
|
||||
default=False,
|
||||
editable=False,
|
||||
verbose_name=_("is user balance"),
|
||||
help_text=_("There should be only one balance payment method."),
|
||||
validators=[check_no_balance]
|
||||
)
|
||||
|
|
@ -882,13 +884,12 @@ class Cotisation(RevMixin, AclMixin, models.Model):
|
|||
'Vente',
|
||||
on_delete=models.CASCADE,
|
||||
null=True,
|
||||
verbose_name=_("purchase")
|
||||
)
|
||||
type_cotisation = models.CharField(
|
||||
verbose_name=_("subscription type"),
|
||||
choices=COTISATION_TYPE,
|
||||
max_length=255,
|
||||
default='All',
|
||||
verbose_name=_("subscription type")
|
||||
)
|
||||
date_start = models.DateTimeField(
|
||||
verbose_name=_("start date")
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ class BalancePayment(PaymentMethodMixin, models.Model):
|
|||
editable=False
|
||||
)
|
||||
minimum_balance = models.DecimalField(
|
||||
verbose_name=_("Minimum balance"),
|
||||
verbose_name=_("minimum balance"),
|
||||
help_text=_("The minimal amount of money allowed for the balance"
|
||||
" at the end of a payment. You can specify negative "
|
||||
"amount."
|
||||
|
|
@ -54,7 +54,7 @@ class BalancePayment(PaymentMethodMixin, models.Model):
|
|||
default=0,
|
||||
)
|
||||
maximum_balance = models.DecimalField(
|
||||
verbose_name=_("Maximum balance"),
|
||||
verbose_name=_("maximum balance"),
|
||||
help_text=_("The maximal amount of money allowed for the balance."),
|
||||
max_digits=5,
|
||||
decimal_places=2,
|
||||
|
|
@ -63,7 +63,7 @@ class BalancePayment(PaymentMethodMixin, models.Model):
|
|||
null=True,
|
||||
)
|
||||
credit_balance_allowed = models.BooleanField(
|
||||
verbose_name=_("Allow user to credit their balance"),
|
||||
verbose_name=_("allow user to credit their balance"),
|
||||
default=False,
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ class ChequePayment(PaymentMethodMixin, models.Model):
|
|||
"""
|
||||
|
||||
class Meta:
|
||||
verbose_name = _("Cheque")
|
||||
verbose_name = _("cheque")
|
||||
|
||||
payment = models.OneToOneField(
|
||||
Paiement,
|
||||
|
|
|
|||
|
|
@ -45,19 +45,19 @@ class ComnpayPayment(PaymentMethodMixin, models.Model):
|
|||
editable=False
|
||||
)
|
||||
payment_credential = models.CharField(
|
||||
verbose_name=_("ComNpay VAT Number"),
|
||||
max_length=255,
|
||||
default='',
|
||||
blank=True,
|
||||
verbose_name=_("ComNpay VAT Number"),
|
||||
)
|
||||
payment_pass = AESEncryptedField(
|
||||
verbose_name=_("ComNpay secret key"),
|
||||
max_length=255,
|
||||
null=True,
|
||||
blank=True,
|
||||
verbose_name=_("ComNpay secret key"),
|
||||
)
|
||||
minimum_payment = models.DecimalField(
|
||||
verbose_name=_("Minimum payment"),
|
||||
verbose_name=_("minimum payment"),
|
||||
help_text=_("The minimal amount of money you have to use when paying"
|
||||
" with ComNpay"),
|
||||
max_digits=5,
|
||||
|
|
@ -65,8 +65,10 @@ class ComnpayPayment(PaymentMethodMixin, models.Model):
|
|||
default=1,
|
||||
)
|
||||
production = models.BooleanField(
|
||||
verbose_name=_("Production mode"),
|
||||
help_text=_("When enabled it will use production URL instead of "
|
||||
"homologation"),
|
||||
default=True,
|
||||
verbose_name=_("Production mode enabled (production URL, instead of homologation)"),
|
||||
)
|
||||
|
||||
def return_url_comnpay(self):
|
||||
|
|
|
|||
|
|
@ -41,21 +41,23 @@ class NotePayment(PaymentMethodMixin, models.Model):
|
|||
|
||||
payment = models.OneToOneField(
|
||||
Paiement,
|
||||
on_delete = models.CASCADE,
|
||||
related_name = 'payment_method',
|
||||
editable = False
|
||||
on_delete=models.CASCADE,
|
||||
related_name='payment_method',
|
||||
editable=False
|
||||
)
|
||||
server = models.CharField(
|
||||
verbose_name=_("server"),
|
||||
max_length=255,
|
||||
verbose_name=_("server")
|
||||
)
|
||||
port = models.PositiveIntegerField(
|
||||
blank = True,
|
||||
null = True
|
||||
verbose_name=_("port"),
|
||||
blank=True,
|
||||
null=True
|
||||
)
|
||||
id_note = models.PositiveIntegerField(
|
||||
blank = True,
|
||||
null = True
|
||||
verbose_name=_("id of destination note"),
|
||||
blank=True,
|
||||
null=True
|
||||
)
|
||||
|
||||
def end_payment(self, invoice, request):
|
||||
|
|
|
|||
Loading…
Reference in a new issue