Commit ccf43cee authored by Patrick's avatar Patrick

Work and tests in progress

parent 2fa467a8
......@@ -57,7 +57,8 @@ class ConfigurationAdmin(TranslatableAdmin):
'customers_must_confirm_orders',
('bank_account', 'max_week_wo_participation'),
('membership_fee', 'membership_fee_duration'),
'how_to_register'),
'notification_is_public',
'notification'),
}),
]
if Producer.objects.filter(producer_pre_opening=True).order_by('?').only('id').exists():
......@@ -109,6 +110,7 @@ class ConfigurationAdmin(TranslatableAdmin):
'sms_gateway_mail',
'invoice',
('currency', 'vat_id'),
'how_to_register'
),
}),
]
......
......@@ -431,11 +431,11 @@ class PermanenceInPreparationAdmin(TranslatableAdmin):
email_will_be_sent, email_will_be_sent_to = send_email_to_who(
repanier.apps.REPANIER_SETTINGS_SEND_OPENING_MAIL_TO_CUSTOMER
)
if 'apply' in request.POST:
if 'apply' in request.POST or 'apply-wo-mail' in request.POST:
form = OpenAndSendOfferForm(request.POST)
if form.is_valid():
user_message, user_message_level = task_order.admin_open_and_send(
request, permanence
request, permanence, 'apply-wo-mail' in request.POST
)
self.message_user(request, user_message, user_message_level)
return HttpResponseRedirect(request.get_full_path())
......
......@@ -291,6 +291,7 @@ class OfferItemSendAdmin(admin.ModelAdmin):
@transaction.atomic
def save_related(self, request, form, formsets, change):
getcontext().rounding = ROUND_HALF_UP
for formset in formsets:
# option.py -> construct_change_message doesn't test the presence of those array not created at form initialisation...
if not hasattr(formset, 'new_objects'): formset.new_objects = []
......@@ -380,6 +381,7 @@ class OfferItemSendAdmin(admin.ModelAdmin):
ratio = DECIMAL_ZERO
else:
ratio = DECIMAL_ONE
# Rule of 3
if ratio != DECIMAL_ONE:
adjusted_invoice = DECIMAL_ZERO
i = 0
......
......@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Repanier\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-04-26 06:25+0200\n"
"PO-Revision-Date: 2017-04-28 22:28+0100\n"
"POT-Creation-Date: 2017-04-30 04:23+0200\n"
"PO-Revision-Date: 2017-04-30 12:32+0100\n"
"Last-Translator: Patrick Colmant <pcolmant@gmail.com>\n"
"Language-Team: Patrick Colmant <pcolmant@gmail.com>\n"
"Language: fr\n"
......@@ -42,21 +42,21 @@ msgid "vat"
msgstr "TVA"
#: admin/admin_filter.py:133 admin/bankaccount.py:147 models/bankaccount.py:23
#: models/bankaccount.py:110 models/customer.py:258 models/invoice.py:32
#: models/invoice.py:35 models/invoice.py:503 models/invoice.py:547
#: models/bankaccount.py:110 models/customer.py:258 models/invoice.py:33
#: models/invoice.py:36 models/invoice.py:505 models/invoice.py:549
#: models/permanenceboard.py:15 models/purchase.py:41 models/purchase.py:43
#: xlsx/xlsx_invoice.py:267 xlsx/xlsx_invoice.py:373 xlsx/xlsx_order.py:398
#: xlsx/xlsx_purchase.py:42 xlsx/xlsx_purchase.py:584
#: xlsx/xlsx_invoice.py:266 xlsx/xlsx_invoice.py:374 xlsx/xlsx_order.py:398
#: xlsx/xlsx_purchase.py:42 xlsx/xlsx_purchase.py:586
msgid "customer"
msgstr "Consommateur"
#: admin/admin_filter.py:160 admin/bankaccount.py:155 admin/forms.py:78
#: models/bankaccount.py:20 models/bankaccount.py:86 models/invoice.py:391
#: models/invoice.py:506 models/offeritem.py:61 models/producer.py:294
#: models/bankaccount.py:20 models/bankaccount.py:86 models/invoice.py:393
#: models/invoice.py:508 models/offeritem.py:61 models/producer.py:294
#: models/product.py:30 models/purchase.py:39
#: templates/repanier/pre_order_form.html:32 xlsx/xlsx_order.py:395
#: xlsx/xlsx_product.py:50 xlsx/xlsx_purchase.py:40 xlsx/xlsx_purchase.py:578
#: xlsx/xlsx_purchase.py:579
#: xlsx/xlsx_product.py:50 xlsx/xlsx_purchase.py:40 xlsx/xlsx_purchase.py:580
#: xlsx/xlsx_purchase.py:581
msgid "producer"
msgstr "Fournisseur"
......@@ -81,7 +81,7 @@ msgid "not invoiced"
msgstr "Pas encore facturés"
#: admin/admin_filter.py:246 models/customer.py:96 models/customer.py:127
#: models/customer.py:188 models/invoice.py:100 models/invoice.py:427
#: models/customer.py:188 models/invoice.py:101 models/invoice.py:429
#: models/producer.py:96 models/producer.py:140 models/producer.py:226
#: models/producer.py:263
msgid "balance"
......@@ -115,24 +115,24 @@ msgstr ""
"faites le manuellement sans passer par l'importation."
#: admin/bankaccount.py:161 models/bankaccount.py:37 models/bankaccount.py:59
#: models/invoice.py:92 models/invoice.py:419 xlsx/xlsx_invoice.py:73
#: xlsx/xlsx_invoice.py:124
#: models/invoice.py:93 models/invoice.py:421 xlsx/xlsx_invoice.py:72
#: xlsx/xlsx_invoice.py:123
msgid "bank_amount_in"
msgstr "Entrée"
#: admin/bankaccount.py:162 models/bankaccount.py:37 models/invoice.py:92
#: models/invoice.py:419
#: admin/bankaccount.py:162 models/bankaccount.py:37 models/invoice.py:93
#: models/invoice.py:421
msgid "payment_on_the_account"
msgstr "Virement entrant"
#: admin/bankaccount.py:165 models/bankaccount.py:41 models/bankaccount.py:69
#: models/invoice.py:95 models/invoice.py:422 xlsx/xlsx_invoice.py:74
#: xlsx/xlsx_invoice.py:125
#: models/invoice.py:96 models/invoice.py:424 xlsx/xlsx_invoice.py:73
#: xlsx/xlsx_invoice.py:124
msgid "bank_amount_out"
msgstr "Sortie"
#: admin/bankaccount.py:166 models/bankaccount.py:41 models/invoice.py:95
#: models/invoice.py:422
#: admin/bankaccount.py:166 models/bankaccount.py:41 models/invoice.py:96
#: models/invoice.py:424
msgid "payment_from_the_account"
msgstr "Virement sortant"
......@@ -244,7 +244,7 @@ msgstr "Créer un duplicata"
msgid "Advanced descriptions"
msgstr "Descriptions avancées"
#: admin/box.py:241 admin/configuration.py:99 admin/customer.py:360
#: admin/box.py:241 admin/configuration.py:100 admin/customer.py:360
#: admin/producer.py:356 admin/product.py:500
msgid "Advanced options"
msgstr "Paramètres avancés"
......@@ -261,19 +261,19 @@ msgstr ""
"Le récapitulatif du groupe ne peut être envoyé que si le récapitulatif "
"personnel est aussi envoyé"
#: admin/configuration.py:65
#: admin/configuration.py:66
msgid "Pre-opening mails"
msgstr "✉ mails de pré-ouverture des commandes"
#: admin/configuration.py:74
#: admin/configuration.py:75
msgid "Opening mails"
msgstr "✉ mails d'ouverture des commandes"
#: admin/configuration.py:81
#: admin/configuration.py:82
msgid "Ordering mails"
msgstr "✉ mails de transmission des commandes"
#: admin/configuration.py:91
#: admin/configuration.py:92
msgid "Invoicing mails"
msgstr "✉ mails de facturation des commandes"
......@@ -392,7 +392,7 @@ msgstr ""
"Une surcharge de %(surcharge)s%% sur les factures avec livraison "
"\"%(delivery_point)s\" est appliquée%(customer_price)s."
#: admin/forms.py:12 admin/forms.py:26 models/configuration.py:112
#: admin/forms.py:12 admin/forms.py:26 models/configuration.py:115
msgid "offer customer mail"
msgstr "Contenu du ✉"
......@@ -402,7 +402,7 @@ msgstr ""
"Si l'option \"seules les commandes confirmées sont prises en compte\" est "
"activée, ✉ signalant qu'une commande a été annulée"
#: admin/forms.py:28 models/configuration.py:130
#: admin/forms.py:28 models/configuration.py:133
msgid "offer producer mail"
msgstr "Contenu du ✉"
......@@ -418,11 +418,11 @@ msgstr "Nombre de permanence(s)"
msgid "Number of week(s) between two permanences"
msgstr "Nombre de semaine(s) entre deux permamences"
#: admin/forms.py:48 models/configuration.py:205
#: admin/forms.py:48 models/configuration.py:208
msgid "invoice customer mail"
msgstr "Contenu du ✉"
#: admin/forms.py:51 models/configuration.py:224
#: admin/forms.py:51 models/configuration.py:227
msgid "invoice producer mail"
msgstr "Contenu du ✉"
......@@ -434,7 +434,7 @@ msgstr "Date du paiement"
msgid "File to import"
msgstr "Fichier à importer"
#: admin/forms.py:77 admin/forms.py:92 models/invoice.py:468
#: admin/forms.py:77 admin/forms.py:92 models/invoice.py:470
msgid "invoice reference"
msgstr "Référence facture"
......@@ -442,11 +442,11 @@ msgstr "Référence facture"
msgid "short_profile_name"
msgstr "Nom abrégé"
#: admin/forms.py:89 models/invoice.py:461
#: admin/forms.py:89 models/invoice.py:463
msgid "calculated balance to be invoiced"
msgstr "Montant réclamé par le producteur calculé par Repanier"
#: admin/forms.py:91 models/invoice.py:463
#: admin/forms.py:91 models/invoice.py:465
msgid "balance to be invoiced"
msgstr "Montant réclamé par le producteur"
......@@ -587,13 +587,13 @@ msgstr "Annuler la dernière facture / annulation de livraison"
msgid "cancel archiving"
msgstr "Annuler l'archivage"
#: admin/permanence_done.py:435 tools.py:642
#: admin/permanence_done.py:435 tools.py:643
#, python-format
msgid "The amount of your order is %(amount)s."
msgstr "Le montant de votre commande s'élève à %(amount)s."
#: admin/permanence_done.py:439 admin/permanence_in_preparation.py:595
#: tools.py:672
#: tools.py:673
#, python-format
msgid "The balance of your account as of %(date)s is %(balance)s."
msgstr "Le solde de votre compte en date du %(date)s est de %(balance)s."
......@@ -715,7 +715,7 @@ msgstr "Veuillez confirmer votre demande de clôture des commandes."
msgid "close orders"
msgstr "3 --- Clôturer les commandes"
#: admin/permanence_in_preparation.py:601 tools.py:569 tools.py:608
#: admin/permanence_in_preparation.py:601 tools.py:570 tools.py:609
#, python-format
msgid ""
"This balance does not take account of any unrecognized payments %(bank)s and "
......@@ -725,7 +725,7 @@ msgstr ""
"facture pour un montant de %(bank)s, ni compte des commandes qui ne sont pas "
"encore facturées pour un montant de %(other_order)s."
#: admin/permanence_in_preparation.py:616 tools.py:688
#: admin/permanence_in_preparation.py:616 tools.py:689
#, python-format
msgid ""
"Please pay %(payment)s to the bank account %(name)s %(number)s with "
......@@ -1023,7 +1023,7 @@ msgid "department_for_customer"
msgstr "Rayon"
#: admin/purchase.py:243 const.py:277 email/email_order.py:33
#: models/configuration.py:308 views/btn_confirm_order_ajax.py:48
#: models/configuration.py:311 views/btn_confirm_order_ajax.py:48
msgid "Order"
msgstr "Commande"
......@@ -1060,12 +1060,12 @@ msgid "Duplicate offer_items are not allowed."
msgstr "Le même produit ne peut pas être sélectionné deux fois."
#: admin/rule_of_3_per_customer.py:95 admin/rule_of_3_per_product.py:100
#: models/invoice.py:513 models/invoice.py:527 models/offeritem.py:109
#: models/invoice.py:515 models/invoice.py:529 models/offeritem.py:109
#: models/offeritem.py:265
msgid "producer amount invoiced"
msgstr "Facturé par le producteur"
#: admin/rule_of_3_per_customer.py:97 models/invoice.py:518
#: admin/rule_of_3_per_customer.py:97 models/invoice.py:520
#: models/offeritem.py:114
msgid "customer amount invoiced"
msgstr "Facturé au consommateur TVAC"
......@@ -1087,8 +1087,8 @@ msgstr ""
"La somme des quantités à facturer (%(qty_invoiced)s) est supérieure à ce qui "
"est disponible (càd inventaire + livré par le producteur)."
#: admin/rule_of_3_per_product.py:56 xlsx/xlsx_invoice.py:232
#: xlsx/xlsx_purchase.py:46 xlsx/xlsx_purchase.py:594
#: admin/rule_of_3_per_product.py:56 xlsx/xlsx_invoice.py:231
#: xlsx/xlsx_purchase.py:46 xlsx/xlsx_purchase.py:596
msgid "purchase price"
msgstr "Prix d'achat"
......@@ -1118,16 +1118,16 @@ msgid "This flag is already set for another staff member"
msgstr ""
"Un et un seul membre de l'équipe de gestion peut assurer cette fonction"
#: apps.py:17 const.py:274 models/configuration.py:296
#: xlsx/xlsx_invoice.py:210
#: apps.py:17 const.py:274 models/configuration.py:299
#: xlsx/xlsx_invoice.py:209
msgid "Permanence"
msgstr "Permanence"
#: apps.py:18 models/configuration.py:297
#: apps.py:18 models/configuration.py:300
msgid "Permanences"
msgstr "Permanences"
#: apps.py:19 models/configuration.py:298
#: apps.py:19 models/configuration.py:301
msgid "Permanence on "
msgstr "Permanence du "
......@@ -1638,19 +1638,19 @@ msgstr "Ceci est le prochain solde. Le système est en train de le calculer."
msgid "This is the latest bank total"
msgstr "Ceci est le dernier solde."
#: const.py:275 models/configuration.py:300
#: const.py:275 models/configuration.py:303
msgid "Closure"
msgstr "Clôture"
#: const.py:276 models/configuration.py:304
#: const.py:276 models/configuration.py:307
msgid "Delivery"
msgstr "Livraison"
#: const.py:278 models/configuration.py:312
#: const.py:278 models/configuration.py:315
msgid "Opening"
msgstr "Offre"
#: const.py:279 models/configuration.py:316
#: const.py:279 models/configuration.py:319
msgid "Distribution"
msgstr "Distribution"
......@@ -1903,11 +1903,11 @@ msgstr ""
"Ces frais sont ajoutés aux commandes dont le minimum de commande n'est pas "
"atteint."
#: models/configuration.py:95 models/invoice.py:113 models/lut.py:97
#: models/configuration.py:95 models/invoice.py:114 models/lut.py:97
msgid "Minium order amount for free shipping cost"
msgstr "Minimum pour livraison gratuite"
#: models/configuration.py:96 models/invoice.py:114 models/lut.py:98
#: models/configuration.py:96 models/invoice.py:115 models/lut.py:98
msgid "This is the minimum order amount to avoid shipping cost."
msgstr ""
"Minimum à commander pour éviter des frais (0 = les frais s'appliquent "
......@@ -1915,79 +1915,88 @@ msgstr ""
"dans le cas où le groupe possède un consommateur responsable. Sinon il est "
"porte sur le total de chaque facture individuelle."
#: models/configuration.py:100
#: models/configuration.py:99
msgid "the notification is public"
msgstr "Le message d'annonce \"flash\" ci-dessous est public"
#: models/configuration.py:101
msgid "group label"
msgstr "Label à mentionner sur les factures du groupe"
#: models/configuration.py:104
#: models/configuration.py:105
msgid "how to register"
msgstr "Message pour expliquer comment créer un compte \"consommateur\""
#: models/configuration.py:145
#: models/configuration.py:110
msgid "notification"
msgstr ""
"Message d'annonce \"flash\" affiché sur les pages d'accueil et de commande"
#: models/configuration.py:148
msgid "order customer mail"
msgstr "Contenu du ✉"
#: models/configuration.py:163
#: models/configuration.py:166
msgid "cancelled order customer mail"
msgstr "Contenu du ✉"
#: models/configuration.py:175
#: models/configuration.py:178
msgid "order staff mail"
msgstr "Contenu du ✉"
#: models/configuration.py:192
#: models/configuration.py:195
msgid "order producer mail"
msgstr "Contenu du ✉"
#: models/configuration.py:269
#: models/configuration.py:272
msgid "configuration"
msgstr "configuration"
#: models/configuration.py:270
#: models/configuration.py:273
msgid "configurations"
msgstr "configurations"
#: models/configuration.py:301
#: models/configuration.py:304
msgid "Closures"
msgstr "Clôtures"
#: models/configuration.py:302
#: models/configuration.py:305
msgid "Closure on "
msgstr "Clôture du "
#: models/configuration.py:305
#: models/configuration.py:308
msgid "Deliveries"
msgstr "Livraisons"
#: models/configuration.py:306
#: models/configuration.py:309
msgid "Delivery on "
msgstr "Livraison du "
#: models/configuration.py:309 xlsx/export_tools.py:39
#: models/configuration.py:312 xlsx/export_tools.py:39
msgid "Orders"
msgstr "Commandes"
#: models/configuration.py:310
#: models/configuration.py:313
msgid "Order on "
msgstr "Commande du "
#: models/configuration.py:313
#: models/configuration.py:316
msgid "Openings"
msgstr "Offres"
#: models/configuration.py:314
#: models/configuration.py:317
msgid "Opening on "
msgstr "Offre du "
#: models/configuration.py:317
#: models/configuration.py:320
msgid "Distributions"
msgstr "Distributions"
#: models/configuration.py:318
#: models/configuration.py:321
msgid "Distribution on "
msgstr "Distribution du "
#: models/configuration.py:404 task/task_invoice.py:339
#: models/configuration.py:407 task/task_invoice.py:339
msgid "Membership fee"
msgstr "Cotisation"
......@@ -2059,8 +2068,8 @@ msgid "This multiplier is applied to each product ordered by this customer."
msgstr ""
"0,9 signifie -10% sur le prix tarif. 1,06 signifie +6% sur le prix tarif."
#: models/customer.py:94 models/customer.py:115 models/invoice.py:98
#: models/invoice.py:425 models/producer.py:94 models/producer.py:131
#: models/customer.py:94 models/customer.py:115 models/invoice.py:99
#: models/invoice.py:427 models/producer.py:94 models/producer.py:131
msgid "date_balance"
msgstr "Date de calcul du solde"
......@@ -2106,16 +2115,16 @@ msgstr "Date de la dernière cotisation"
msgid "participation"
msgstr "Participation"
#: models/customer.py:246 models/purchase.py:290
#: models/customer.py:246 models/purchase.py:297
msgid "purchase"
msgstr "Achat"
#: models/customer.py:259 models/invoice.py:548
#: models/customer.py:259 models/invoice.py:550
msgid "customers"
msgstr "Consommateurs"
#: models/deliveryboard.py:23 models/purchase.py:108 xlsx/xlsx_invoice.py:264
#: xlsx/xlsx_purchase.py:49 xlsx/xlsx_purchase.py:591
#: models/deliveryboard.py:23 models/purchase.py:108 xlsx/xlsx_invoice.py:263
#: xlsx/xlsx_invoice.py:415 xlsx/xlsx_purchase.py:49 xlsx/xlsx_purchase.py:593
msgid "comment"
msgstr "Commentaire"
......@@ -2137,7 +2146,7 @@ msgid ""
"done"
msgstr "Statut (Planifié, Ouvert, Commandes transmises, Facturé)"
#: models/deliveryboard.py:112 models/invoice.py:41
#: models/deliveryboard.py:112 models/invoice.py:42
msgid "delivery board"
msgstr "Tableau des livraisons"
......@@ -2145,78 +2154,78 @@ msgstr "Tableau des livraisons"
msgid "deliveries board"
msgstr "Tableaux des livraisons"
#: models/invoice.py:48 models/invoice.py:400 models/purchase.py:34
#: xlsx/xlsx_invoice.py:266
#: models/invoice.py:49 models/invoice.py:402 models/purchase.py:34
#: xlsx/xlsx_invoice.py:265
msgid "invoice_status"
msgstr "Statut"
#: models/invoice.py:57
#: models/invoice.py:58
msgid "is_order_confirm_send"
msgstr "confirmation de la commande envoyée"
#: models/invoice.py:59 models/invoice.py:465 models/permanence.py:131
#: models/invoice.py:60 models/invoice.py:467 models/permanence.py:131
msgid "invoice sort order"
msgstr "Ordre de tri des factures"
#: models/invoice.py:62 models/invoice.py:402
#: models/invoice.py:63 models/invoice.py:404
msgid "date_previous_balance"
msgstr "Date de calcul du solde précédemment facturé"
#: models/invoice.py:64 models/invoice.py:404
#: models/invoice.py:65 models/invoice.py:406
msgid "previous_balance"
msgstr "Solde précédent facturé"
#: models/invoice.py:67 models/invoice.py:79 models/invoice.py:407
#: models/invoice.py:430 models/permanence.py:105
#: models/invoice.py:68 models/invoice.py:80 models/invoice.py:409
#: models/invoice.py:432 models/permanence.py:105
msgid "Total amount"
msgstr "Total avec TVA"
#: models/invoice.py:68 models/invoice.py:408 models/offeritem.py:110
#: models/invoice.py:69 models/invoice.py:410 models/offeritem.py:110
msgid "Total purchase amount vat included"
msgstr "Facturé par le producteur TVAC"
#: models/invoice.py:71 models/invoice.py:83 models/invoice.py:411
#: models/invoice.py:438 xlsx/xlsx_order.py:40 xlsx/xlsx_order.py:133
#: models/invoice.py:72 models/invoice.py:84 models/invoice.py:413
#: models/invoice.py:440 xlsx/xlsx_order.py:40 xlsx/xlsx_order.py:133
msgid "Total vat"
msgstr "Total avec TVA"
#: models/invoice.py:72 models/invoice.py:412
#: models/invoice.py:73 models/invoice.py:414
msgid "Vat part of the total purchased"
msgstr "TVA"
#: models/invoice.py:75 models/invoice.py:415 models/invoice.py:451
#: models/invoice.py:455 models/offeritem.py:98 models/product.py:76
#: models/purchase.py:89 models/purchase.py:169 xlsx/xlsx_invoice.py:220
#: xlsx/xlsx_invoice.py:397 xlsx/xlsx_offer.py:69 xlsx/xlsx_purchase.py:45
#: models/invoice.py:76 models/invoice.py:417 models/invoice.py:453
#: models/invoice.py:457 models/offeritem.py:98 models/product.py:76
#: models/purchase.py:89 models/purchase.py:169 xlsx/xlsx_invoice.py:219
#: xlsx/xlsx_invoice.py:398 xlsx/xlsx_offer.py:69 xlsx/xlsx_purchase.py:45
msgid "deposit"
msgstr "Consigne"
#: models/invoice.py:76 models/invoice.py:416 models/product.py:77
#: models/invoice.py:77 models/invoice.py:418 models/product.py:77
#: models/purchase.py:90
msgid "deposit to add to the original unit price"
msgstr "En supplément"
#: models/invoice.py:80 models/invoice.py:431
#: models/invoice.py:81 models/invoice.py:433
msgid "purchase to add amount vat included"
msgstr "Montant à ajouter TVA incluse"
#: models/invoice.py:84 models/invoice.py:439 models/invoice.py:443
#: models/invoice.py:85 models/invoice.py:441 models/invoice.py:445
msgid "vat to add"
msgstr "TVA à ajouter"
#: models/invoice.py:87 models/invoice.py:446 models/lut.py:92
#: models/invoice.py:88 models/invoice.py:448 models/lut.py:92
msgid "Delivery point transport"
msgstr "Frais de livraison"
#: models/invoice.py:88 models/invoice.py:447
#: models/invoice.py:89 models/invoice.py:449
msgid "transport to add"
msgstr "Transport à ajouter"
#: models/invoice.py:103 models/lut.py:87
#: models/invoice.py:104 models/lut.py:87
msgid "Delivery point price list multiplier"
msgstr "Coefficient appliqué à ce point de livraison"
#: models/invoice.py:104
#: models/invoice.py:105
msgid ""
"This multiplier is applied once for groups with entitled customer or at each "
"customer invoice for open groups."
......@@ -2225,11 +2234,11 @@ msgstr ""
"total de la facture globale du groupe. Dans le cas contraire, il est "
"appliqué au total des factures individuelles de chaque consommateur."
#: models/invoice.py:108
#: models/invoice.py:109
msgid "Delivery point shipping cost"
msgstr "Frais de livraison"
#: models/invoice.py:109 models/lut.py:93
#: models/invoice.py:110 models/lut.py:93
msgid ""
"This amount is added once for groups with entitled customer or at each "
"customer for open groups."
......@@ -2238,65 +2247,70 @@ msgstr ""
"cas où le groupe possède un consommateur responsable. Sinon il est ajouté au "
"total de chaque facture individuelle."
#: models/invoice.py:122 models/permanence.py:126
#: models/invoice.py:123 models/permanence.py:126
msgid "master permanence"
msgstr "Permanence maître"
#: models/invoice.py:357
#: models/invoice.py:358
msgid "Canceled order"
msgstr "Commande annulée"
#: models/invoice.py:383
#: models/invoice.py:378
#, python-format
msgid "Cancelled qty : %s"
msgstr "Qté non confirmée : %s"
#: models/invoice.py:385
msgid "customer invoice"
msgstr "Facture d'un consommateur"
#: models/invoice.py:384
#: models/invoice.py:386
msgid "customers invoices"
msgstr "Factures de consommateurs"
#: models/invoice.py:434
#: models/invoice.py:436
msgid "Total stock"
msgstr "Montant déduit du stock"
#: models/invoice.py:435
#: models/invoice.py:437
msgid "stock taken amount vat included"
msgstr "Montant déduit du stock TVA incluse"
#: models/invoice.py:442
#: models/invoice.py:444
msgid "Total stock vat"
msgstr "Total TVA déduit du stock"
#: models/invoice.py:452 models/invoice.py:456 views/forms.py:192
#: models/invoice.py:454 models/invoice.py:458 views/forms.py:192
msgid "deposit to add"
msgstr "+ Consigne"
#: models/invoice.py:459
#: models/invoice.py:461
msgid "to be paid"
msgstr "A payer"
#: models/invoice.py:495
#: models/invoice.py:497
msgid "producer invoice"
msgstr "Facture d'un producteur"
#: models/invoice.py:496
#: models/invoice.py:498
msgid "producers invoices"
msgstr "Facture de producteurs"
#: models/invoice.py:514 models/invoice.py:519 models/offeritem.py:115
#: models/invoice.py:516 models/invoice.py:521 models/offeritem.py:115
msgid "Total selling amount vat included"
msgstr "Facturé au consommateur à la pièce ou au kg TVA incluse"
#: models/invoice.py:524 models/offeritem.py:262 models/purchase.py:158
#: models/invoice.py:526 models/offeritem.py:262 models/purchase.py:158
#: models/purchase.py:166
#, python-format
msgid "<b>%(price)s</b>"
msgstr "<b>%(price)s</b>"
#: models/invoice.py:535
#: models/invoice.py:537
msgid "customer x producer invoice"
msgstr "Consommateur X Fournisseur - Facture"
#: models/invoice.py:536
#: models/invoice.py:538
msgid "customers x producers invoices"
msgstr "Consommateur X Fournisseur - Factures"
......@@ -2374,8 +2388,8 @@ msgid "producer sort order for optimization"
msgstr "Ordre de tri producteru pour optimisation"
#: models/offeritem.py:56 models/product.py:43
#: templates/repanier/producer_invoice_form.html:90 xlsx/xlsx_invoice.py:268
#: xlsx/xlsx_invoice.py:381 xlsx/xlsx_product.py:41
#: templates/repanier/producer_invoice_form.html:90 xlsx/xlsx_invoice.py:267
#: xlsx/xlsx_invoice.py:382 xlsx/xlsx_product.py:41
msgid "reference"
msgstr "Référence"
......@@ -2400,8 +2414,8 @@ msgid "used for helping to determine the order of preparation of this product"
msgstr "Utilisé pour aider à déterminer l'ordre de préparation des paniers"
#: models/offeritem.py:83 models/product.py:64 models/purchase.py:153
#: models/purchase.py:161 views/forms.py:189 xlsx/xlsx_invoice.py:230
#: xlsx/xlsx_offer.py:64 xlsx/xlsx_purchase.py:44 xlsx/xlsx_purchase.py:621
#: models/purchase.py:161 views/forms.py:189 xlsx/xlsx_invoice.py:229
#: xlsx/xlsx_offer.py:64 xlsx/xlsx_purchase.py:44 xlsx/xlsx_purchase.py:623
#: xlsx/xlsx_stock.py:32 xlsx/xlsx_stock.py:324
msgid "producer unit price"