From e298ec88f18549f27387ef1d2d86eea01ff253a4 Mon Sep 17 00:00:00 2001 From: "Edgar P. Burkhart" Date: Tue, 18 Apr 2023 10:55:35 +0200 Subject: [PATCH] Fix empty invoice table --- nummi/main/locale/fr/LC_MESSAGES/django.mo | Bin 2759 -> 2557 bytes nummi/main/locale/fr/LC_MESSAGES/django.po | 80 ++++++++++--------- nummi/main/templates/main/table/invoice.html | 28 ++++--- 3 files changed, 60 insertions(+), 48 deletions(-) diff --git a/nummi/main/locale/fr/LC_MESSAGES/django.mo b/nummi/main/locale/fr/LC_MESSAGES/django.mo index fb3fa083137992f87e9ba2f975d4c4a838998a0d..0c4e7035e2488f19057f462f08953e8dc39d0f61 100644 GIT binary patch delta 1133 zcmYk+KWI}y9Ki8wOl#9>)uz!}t*!Ncj8;L!3@x?_4vH?KgF2LuLI)ENqb`z3oy4IO z(M1J?3U-hRLUFK&6hs~C;2#vXf`dz)6u;l(5Rd%c=iS}A``x?uUgk2t)73BS$%#PO zOROgzHiU2pb4xf-4kSZp$2=~@W7v!*aV4I^0W4t?K8a3a3-uZF`q$|A_sB2I*Xz~r zkrM}g$5vcG2QH!m8yZ7MVGCOCK)OOVI$>X|XVH23WBY#e`oY+KB(@(%e&G~{WT=L4 zmJ<_?po!082VTK7coR+Z2wlh&x`5|s!WU?wSF!&sI?p^h@3+|gBewrS$0azll0T$4 zS&bQ7hB-7r9=SFQ;z1tEVN6rM#%eeXchH61=g^6hIE=Gsf09+%--<3IjV`PQy^$$ym(yNGC%B4^yMa!83r&1Cwm*nIMt~t(1kRGJUY=Zy3iBo0?wcd8bz-wq4Qiu=e-{LZ^!<7DfZt9 zCTY-T=vVL(P4GFkFQ9j}h&+jZWd~=gV$DRBO@ueK+X`i4o!ZgI+(o!JzbfCqu!Y!T zh0;T8Cbkmfs_lw*o+T^^qMzs`EZ)^lB4_2lQrk7^zAu(_b!soPTc08Nhyhn`|T;C6Nsy9mDqw{;ugF1SPPPUmzbnQusyd&f$b%43D%_?yOe)3Z%eiMF9ip;9XL Qj*b*ARxT9BCsKd@0+&Bj+yDRo delta 1338 zcmY+^J4{ni9LMoPZ7WnB%A=?hs3Krd@Kx<30W~q{z=TaqV5sIMmee-sy)C*>opfl7 z2E_#jC!{cwT4BNu1iig>u1fOe(T{pW1{ip^g`{>%awzbPBD z$c-kxi%s|lTksjS<6G>+71V^^Pz%y*T1W^raSIns7)CwsMZHK2HGbUY$80`{LFPB7 zY=bEbQ$L4|SVm1yLFP0!unlix2R_6xj_ak(`Y=l{IY$170X)L zb#AoMMbyggp(cKU8tAFbzd*HrWBp)VLG9css{b0QpP!1xZA2}s6P53=4m7a;v^66n z^u`I))}KHvU=sBmo<@Ca)Ao4|btH4R4HvKnAEU;5j~eeIYQdjT3;BXtz;{$Te~A5W z=BA0KnjnH|FpO$&7&XACHHrF_q)-#MHh&5Ah85Hi&ZF8rKu)My^b3m;v1+aMyj|z7 zfm8;F{e+LuIjaoTsGh$T(o5{Mxo+G-93r%6mA)F)>kwD{bhSe&+Mxr4UU(OwBP;7I zwdE>%h!J8pv6I+GXjin=`jAv~EGl|iUd|j;#g=~DZtvM)vx68Wv?KQ433s)Rx2t+* zmJ|L&UBsD71KB>t*t}`Psm`SSmv@oz4Dh=9<5`b&cKS\n" "Language-Team: edpibu \n" @@ -35,14 +35,14 @@ msgstr "Utilisateur" #: .\main\models.py:45 .\main\models.py:79 .\main\models.py:87 #: .\main\models.py:237 .\main\templates\main\base.html:39 -#: .\main\templates\main\table\snapshot.html:10 -#: .\main\templates\main\table\transaction.html:15 +#: .\main\templates\main\table\snapshot.html:23 +#: .\main\templates\main\table\transaction.html:32 msgid "Account" msgstr "Compte" #: .\main\models.py:45 .\main\models.py:97 .\main\models.py:208 -#: .\main\models.py:278 .\main\templates\main\table\transaction.html:8 -#: .\main\templates\main\transaction_form.html:28 +#: .\main\models.py:278 .\main\templates\main\table\invoice.html:9 +#: .\main\templates\main\table\transaction.html:25 msgid "Name" msgstr "Nom" @@ -60,7 +60,8 @@ msgstr "Comptes" #: .\main\models.py:97 .\main\models.py:121 .\main\models.py:227 #: .\main\templates\main\base.html:49 -#: .\main\templates\main\table\transaction.html:12 +#: .\main\templates\main\plot\category.html:14 +#: .\main\templates\main\table\transaction.html:29 msgid "Category" msgstr "Catégorie" @@ -89,7 +90,7 @@ msgstr "Valeur de fin" msgid "Start value" msgstr "Valeur de début" -#: .\main\models.py:141 .\main\templates\main\table\snapshot.html:13 +#: .\main\models.py:141 .\main\templates\main\table\snapshot.html:26 msgid "Difference" msgstr "Différence" @@ -98,6 +99,8 @@ msgid "Transaction difference" msgstr "Différence des transactions" #: .\main\models.py:154 .\main\models.py:283 +#: .\main\templates\main\table\invoice.html:10 +#: .\main\templates\main\table\invoice.html:21 msgid "File" msgstr "Fichier" @@ -120,17 +123,17 @@ msgstr "Relevés" msgid "Transaction" msgstr "Transaction" -#: .\main\models.py:210 .\main\templates\main\table\transaction.html:17 +#: .\main\models.py:210 msgid "Description" msgstr "Description" -#: .\main\models.py:212 .\main\templates\main\table\snapshot.html:12 -#: .\main\templates\main\table\transaction.html:9 +#: .\main\models.py:212 .\main\templates\main\table\snapshot.html:25 +#: .\main\templates\main\table\transaction.html:26 msgid "Value" msgstr "Valeur" -#: .\main\models.py:214 .\main\templates\main\table\snapshot.html:8 -#: .\main\templates\main\table\transaction.html:7 +#: .\main\models.py:214 .\main\templates\main\table\snapshot.html:21 +#: .\main\templates\main\table\transaction.html:24 msgid "Date" msgstr "Date" @@ -138,7 +141,7 @@ msgstr "Date" msgid "Real date" msgstr "Date réelle" -#: .\main\models.py:217 .\main\templates\main\table\transaction.html:10 +#: .\main\models.py:217 .\main\templates\main\table\transaction.html:27 msgid "Trader" msgstr "Commerçant" @@ -151,8 +154,8 @@ msgstr "Paiement" #: .\main\templates\main\index.html:29 #: .\main\templates\main\list\transaction.html:6 #: .\main\templates\main\list\transaction.html:23 -#: .\main\templates\main\snapshot_form.html:76 -#: .\main\templates\main\table\snapshot.html:14 +#: .\main\templates\main\snapshot_form.html:39 +#: .\main\templates\main\table\snapshot.html:27 msgid "Transactions" msgstr "Transactions" @@ -186,8 +189,9 @@ msgid "Confirm" msgstr "Confirmer" #: .\main\templates\main\form\base.html:17 +#: .\main\templates\main\table\invoice.html:11 +#: .\main\templates\main\table\invoice.html:24 #: .\main\templates\main\tag\form_buttons.html:4 -#: .\main\templates\main\transaction_form.html:35 msgid "Delete" msgstr "Supprimer" @@ -216,37 +220,39 @@ msgstr "Aucune transaction à afficher" msgid "Log In" msgstr "Se connecter" -#: .\main\templates\main\plot\history.html:7 -msgid "Month" -msgstr "Mois" - -#: .\main\templates\main\plot\history.html:8 +#: .\main\templates\main\plot\category.html:15 +#: .\main\templates\main\plot\history.html:14 msgid "Expenses" msgstr "Dépenses" -#: .\main\templates\main\plot\history.html:9 +#: .\main\templates\main\plot\category.html:16 +#: .\main\templates\main\plot\history.html:15 msgid "Income" msgstr "Revenus" -#: .\main\templates\main\table\snapshot.html:18 -msgid "New statement" -msgstr "Nouveau relevé" +#: .\main\templates\main\plot\history.html:13 +msgid "Month" +msgstr "Mois" -#: .\main\templates\main\table\snapshot.html:53 -msgid "View all statements" -msgstr "Voir tous les relevés" +#: .\main\templates\main\table\invoice.html:30 +msgid "No invoice" +msgstr "Aucune facture" -#: .\main\templates\main\table\transaction.html:21 -msgid "New transaction" -msgstr "Ajouter une transaction" - -#: .\main\templates\main\table\transaction.html:64 -msgid "View all transactions" -msgstr "Voir toutes les transactions" - -#: .\main\templates\main\transaction_form.html:40 +#: .\main\templates\main\table\invoice.html:37 msgid "New invoice" msgstr "Nouvelle facture" +#~ msgid "New statement" +#~ msgstr "Nouveau relevé" + +#~ msgid "View all statements" +#~ msgstr "Voir tous les relevés" + +#~ msgid "New transaction" +#~ msgstr "Ajouter une transaction" + +#~ msgid "View all transactions" +#~ msgstr "Voir toutes les transactions" + #~ msgid "Valid" #~ msgstr "Valide" diff --git a/nummi/main/templates/main/table/invoice.html b/nummi/main/templates/main/table/invoice.html index 482b3c8..86506f1 100644 --- a/nummi/main/templates/main/table/invoice.html +++ b/nummi/main/templates/main/table/invoice.html @@ -11,19 +11,25 @@ {% translate "Delete" %} - {% for invoice in transaction.invoices %} - - - {{ invoice.name }} - - - {% translate "File" %} - - - {% translate "Delete" %} + {% if transaction.invoices %} + {% for invoice in transaction.invoices %} + + + {{ invoice.name }} + + + {% translate "File" %} + + {% translate "Delete" %} + + + {% endfor %} + {% else %} + + {% translate "No invoice" %} - {% endfor %} + {% endif %}