From 62813388d76447b3be1aeb3790f0f699562af13f Mon Sep 17 00:00:00 2001 From: Marwan Alwali Date: Fri, 21 Mar 2025 11:54:22 +0300 Subject: [PATCH] update --- .../__pycache__/settings.cpython-311.pyc | Bin 8944 -> 8968 bytes static/images/.DS_Store | Bin 22532 -> 22532 bytes .../sales/estimates/estimate_detail.html | 8 +++---- templates/sales/invoices/invoice_detail.html | 12 +++++------ templates/sales/invoices/invoice_preview.html | 20 +++++++++--------- templates/sales/orders/purchase_order.html | 7 +++--- 6 files changed, 24 insertions(+), 23 deletions(-) diff --git a/car_inventory/__pycache__/settings.cpython-311.pyc b/car_inventory/__pycache__/settings.cpython-311.pyc index b9c2ef3796fa3dcde0b7be9451a400fdec8cf946..e19a2f9cd24319e66b1bed5e3a497f3eb384b65c 100644 GIT binary patch delta 79 zcmez1+Tq5#oR^o20SLZx-%UTck@qqyBgf>2tRehWyoQ!WdWL2edWHrDdS;tV*^Y@b aKA!wXwpr){3xl8!(+36wxw%6wg9QM=6Bi!< delta 54 zcmeBh`{2sEoR^o20SNrLZl>?p$a|TUk$v(*){xCEY{$eIZ%yWwYvz0)P;~)}HZPFN GU;zN$>JpFu diff --git a/static/images/.DS_Store b/static/images/.DS_Store index f18dfd41164f6145f8166f47fc46f5f0a0145c0b..9d90f072d5d41679e2208dec408125dbb5ae9b19 100644 GIT binary patch delta 1287 zcmbW1T}&KR6vxm1?k=5W)^Pc1ff>r;V(KDnsc1?K&;=xJSrl6q`6vY!W-McuS=d=< zTD2RKHYBYdlu6XsG{(=UFBYe*)dydUi6*8G1RK+sSfkO0`k+RAF;VaAZuH3qo#f7$ zbI!fzo;$yP?#T-{c>$|+%v*X^ZLdB=L_Q);lq8chvX+N4=KA8R9=k2!^?5|rYhMpH zz-MPW8l5ZgevhqongJ1q7~+xS^~G&oXGh@MN^Erk!6C1`^Nye@-=d6;jZYk$oaTJV z(humVWY$>L?@eZP%ih%$u~%aq{xM@VZ4Mj9b^FJ7HT-KW)j7FJ-a5K$SjJ3BA317h z*}3tgHLIJNVIH0^G~LV^j~IH!Uyc@k!c5NVn>Dp{6^g2C|F=~V4@qN7GsfbQkv+Cq z!OP2njfy;}iB9fMYi>1-Uy}U!%x$?wMLFoE`ZBtBYm$_Yhnp2SVTne0vN$ucQ;$*ZhTL9eZSDbXm_>M%v`@Vz8@9R>o%2^Yh{?Rx#Got0+_M zwz17ttQ5o9$&Wwx3O~X*Oq@k&utk3>~(cVy-^b z`(pbB;)DM|pY}~|K(;od6(Mm7rNn| zg4?3*_DdWE=N`G!FBHVRn~H$fT`$X=gr4$M`_z6(h=Bh?heFZjJPi9>YuW$B^eJu7 z7j%Pu5Sade2NJdkG`Ayy4s;7VE}VWmfFbP10VHq;Q+OCj0V;)gq_Kbu9uuJMK7kyb z#A%$tQ+Ni?;{^fh9L@_=Z{jVy4F?x-8SfRLeI}4y$2aze10m<3rWIdF{vfqBk5xIP z%`0A~GIo{Om9cUs*p`s&^>9mJMzyonk=Y{dpFQoT?S**EDT`K@yt_LKcgn4_r6A4+ pWnufpJtl4@Zz)kw*fueuf%V1jJ$6}QpFNp)*~xXCV);_1{sO~pJz4+& delta 243 zcmZqKz}T{Zae@?+2lqr7W6@{^1_o9J1_1_!B8GT|T!uu3Y=+d$f*fKjn-w^EnK>DO z@<71B4G~l0c`D2(xtT}7pJj84Ruk*w7dkwX>Lnt7`Qk4c}TELZqUit{K>YOk&_81&J4sXKrP~%cbn{DVq~3M z?S5@@Ad4&Wz*@D<`40l?9an7 PIVNQ8;%Tf*Q0>A1#RoUr diff --git a/templates/sales/estimates/estimate_detail.html b/templates/sales/estimates/estimate_detail.html index b6b53fa5..1eccd8f6 100644 --- a/templates/sales/estimates/estimate_detail.html +++ b/templates/sales/estimates/estimate_detail.html @@ -212,27 +212,27 @@ {% trans "Vat" %} ({{data.vat|percentage}}) - + {{data.total_vat_amount|floatformat}} + + {{data.total_vat_amount|floatformat}} {{ CURRENCY }} {% trans "Discount Amount" %} - - {{data.total_discount|floatformat}} + - {{data.total_discount|floatformat}} {{ CURRENCY }} {% trans "Additional Services" %} {% for service in data.additionals %} - + {{service.name}} - {{service.price_|floatformat}}
+ + {{service.name}} - {{service.price_|floatformat}} {{ CURRENCY }}
{% endfor %} {% trans "Grand Total" %} - {{data.grand_total|floatformat}} + {{data.grand_total|floatformat}} {{ CURRENCY }} diff --git a/templates/sales/invoices/invoice_detail.html b/templates/sales/invoices/invoice_detail.html index 31f0a1bb..66a8dccd 100644 --- a/templates/sales/invoices/invoice_detail.html +++ b/templates/sales/invoices/invoice_detail.html @@ -158,9 +158,9 @@

{% trans 'Due Amount' %}

{% if invoice.is_paid %} -

{{invoice.amount_due}} {{ CURRENCY }}

 +

{{invoice.amount_due|floatformat}} {{ CURRENCY }}

 {% else %} -

{{invoice.amount_due}} {{ CURRENCY }}

+

{{invoice.amount_due|floatformat}} {{ CURRENCY }}

{% endif %}
@@ -260,27 +260,27 @@ {% trans "Discount Amount" %} - - {{data.total_discount}} + - {{data.total_discount|floatformat}} {{ CURRENCY }} {% trans "VAT" %} ({{data.vat}}%) - + {{data.total_vat_amount}} + + {{data.total_vat_amount|floatformat}} {{ CURRENCY }} {% trans "Additional Services" %} {% for service in data.additionals %} - + {{service.name}} - {{service.price_}}
+ + {{service.name}} - {{service.price_|floatformat}} {{ CURRENCY }}
{% endfor %} {% trans "Grand Total" %} - {{data.grand_total}} + {{data.grand_total|floatformat}} {{ CURRENCY }} diff --git a/templates/sales/invoices/invoice_preview.html b/templates/sales/invoices/invoice_preview.html index 2ff17de8..29b905ec 100644 --- a/templates/sales/invoices/invoice_preview.html +++ b/templates/sales/invoices/invoice_preview.html @@ -195,16 +195,16 @@ {{ item.make }} - {{ item.model }} - {{ item.trim }} {{ item.year }} {{ item.vin }} - {{ item.quantity|floatformat:-1 }} - {{ item.unit_price|floatformat:2 }} - {{ item.total_vat|floatformat:2 }} + {{ item.quantity|floatformat }} + {{ item.unit_price|floatformat }} + {{ item.total_vat|floatformat }} {% endfor %} - {{ data.quantity|floatformat:-1 }} - {{ data.total_price|floatformat:2 }} - {{ data.total_vat|floatformat:2 }} + {{ data.quantity|floatformat }} + {{ data.total_price|floatformat }} + {{ data.total_vat|floatformat }} @@ -229,8 +229,8 @@ {% for item in data.additionals %} {{ item.name }} - {{ item.price|floatformat:2 }} - {{ item.price_|floatformat:2 }} + {{ item.price|floatformat }} + {{ item.price_|floatformat }} {% endfor %} @@ -242,12 +242,12 @@ - + - + diff --git a/templates/sales/orders/purchase_order.html b/templates/sales/orders/purchase_order.html index a7353cbc..f0a9b386 100644 --- a/templates/sales/orders/purchase_order.html +++ b/templates/sales/orders/purchase_order.html @@ -1,3 +1,4 @@ +{% load i18n custom_filters %} {% block customCSS %}
VAT{{ data.total_vat_amount|floatformat:2 }} {{ CURRENCY }}{{ data.total_vat_amount|floatformat }} {{ CURRENCY }} ضريبة القيمة المضافة
Total{{ data.grand_total|floatformat:2 }} {{ CURRENCY }}{{ data.grand_total|floatformat }} {{ CURRENCY }} الإجمالي