From 2671db939a51741d19ee62166cc7ef0105a12fbb Mon Sep 17 00:00:00 2001 From: Marwan Alwali Date: Mon, 24 Feb 2025 14:35:10 +0300 Subject: [PATCH] update --- inventory/__pycache__/views.cpython-311.pyc | Bin 217619 -> 217645 bytes .../custom_filters.cpython-311.pyc | Bin 15110 -> 15532 bytes inventory/templatetags/custom_filters.py | 9 ++- inventory/views.py | 8 +-- templates/customers/note_form.html | 10 +--- templates/customers/view_customer.html | 55 ++++++++++++------ templates/dashboards/manager.html | 6 +- templates/ledger/reports/dashboard-copy.html | 1 - .../sales/estimates/estimate_detail.html | 6 +- 9 files changed, 59 insertions(+), 36 deletions(-) diff --git a/inventory/__pycache__/views.cpython-311.pyc b/inventory/__pycache__/views.cpython-311.pyc index 5e9e082211d77e8bc1e2867b3fe302aa442e70f5..38d47dd99ff1c567be56833c6fd70da6858c6bb8 100644 GIT binary patch delta 1028 zcma)*TWnNS6o%*9XXZ>>W`Npu3Qf}?HdwWnbhNRRODTaS6sBAfAws<%VLC#MwyA+g zVoNVb14vq%c2h703-qGB5i3h@GzK-M55~rb!C+!XLy%Oo4JJI|K2D+!zPKOOK70M^ z{A=xhuho6tKYHH3aM15hahY|dFc!Vh*R^m7FJH`C>Pw4+_kPvx8ZgNF4(zP9bv{|= zqr=T-dfR}?(DB9OS~KZcIysd}X7rX+LS}18rTvi%Pv)HK{}?HHfMG?ZTu-OWB2QA6 z(B!2|I)emlUX_XE9E5s#IFAJur={dkY81n|vw)B2m#RX-Fe$x7R4dOH9+#_8Zyiv9 z?qyG>=%f$>T$b?=UGTN6eVh^aL4GfxA70R1PtZY)WR+q;L~_dTSoQ(0p=eFquzV%A zRGn8(giL|utGJ@<;|^T=51ghST0=w~PQ+*v^O$_UhCY~(`n4pxxg>`wiMjbwN;i^c zaYH{}&ByARS2vUy5ks4~t$y})7k`)`p)K@yy?31q*U=NFNSF8yRx5s$;7;-tIeJqK zvvzKhi73*=RVqhzJ;NT1Y@a+!z@k9D+f5y$NyQ$bid8bS7cW%miHNy#mA+HUPCZgf z1=Y@XH`}Bo$|6OL?%Id2U8?rucGTEh$4$%VUh)dJpiZ(I81c|8QwLZMC*_ZW{G=F{ zZw~RIvSUt3+jVFG1$y7>G~1UP$4WilMnK$6fciX12g?ZbHsO&6n`u-`>)sZwF(ogx z((F9UZ*4>&t_^4A-*NRvSfT8*$%gBx1o@9gdChdejt--XXUqZg#X*%RPy8G) z%>VCPF!^{=-ydYs^vdKA!%!j5y~kzc+h}I7vCqufVb{&0xuZz#sEV~wDl^5_B7b2P xW~lyarkCaq?V5LhKmSEnNOrjuwF54-cuu9Tdd_9cyk(B1TyMSM{|iwEH&g%s delta 1051 zcma)*e@xX?7{>4CT<-TKa3u)1I4fG|Fn-kyW;X#5lU4*6X*3iYGUb}kidivhfC43J zBr4GfaT-dyf(I>`*;aXU?xXp2l*md6>@;MEfW{8F0F zsB*e2UH1>2pmPgZt2Re8+GuW)(}ncG0cj~>Mie5Q#f(Mqjue-W=H`Tcpp3)nbFXd< zsw7=l&RO-Xw`b9zBq>}Pq=>6&Dp*a;k=UNR;wgLW%-;Wer}qO;4;f*HEHY*O@NMZK~4C zLoDEK=?)R6sMdS#N1RGqGN@PAlc*nB&!oAa>UzF&n+I9^Am2lSq&G6`;TiejQRYIo z{Mp3UikIc&W2{roxGivxE{Y*jH#O7hhz0WWU+pAILJQ!$Ws&P5$PKMLtoT?DZss%R zm?dg^22NZdJK6}@*Spki^C@kL`(@)36e?$6hEXk#IGo$UMyKBbL0z%cjNRPH9OZe* zBKq~P^2_*Bw825WsEbjC*pxbGPaAp zD6Z0#1N_1@QofhxF*SWe2oe}kW9?+fPdB>bd|9(GTlnAb(X5Q271Nfu@GqM$=?mQy3AcH3q9en7izDcuHIW28i&%B#hc)kp~r+nwn$WnY}xE!Kcr zN$Z2en0gaY`NOY5p(f}WUj&pt#$Too66+);#>8mjt3=`t|L8e0Y!|wn?0j?YIp00^ zoO92;cVC@Ym@K(eT3aWq_}i}85)Xf8wsnWVa}p=nB95pqGJDeH#Ev~u8Z8?s z<2e&2o5#!9z2ZvSh*Nf6bg|jZm3tN(b3Dgg#n*TwVVax6=GCl#8>x_;dITu`WCiDzn>tA~oAHP3D{T6B@u9c_7D z`|{W=Qq>{O*U3IMZ!4eYwc=PRIx2%W7KdmsnOQdbc}Fp>H4qfB7VE`|3T$ciu$&Z? zq#T86>^j+!wU&3Yf2{A6k{W8VP{l6TT6lNnE87sCu1BfQtXb7WL`mW&2}%MQNmu|) z_|Ysu2&>RQO+k{!l$erK;xScoUN_P5!a_8D}=Rp=?S^$@j>`JIFOZkBd7ICr98nS%70VGk*HvJahu-tE-%5ZDL` z3Hk_jGLOqIY@w#k>0tp^^NxMgf12O`g2oT30)8JjNgv%&tvn%v5|_kSa6$-aHLdRu4r76Bbp$eOex7p zF&>Ld8Y5{893vQFJ>Fg;>>!JID{XpE+u1p9_1@>mkX?xzW`L%HAOX#w8`26`(74bpKlQH9mcmq%RPVm4J`e3L&VdvbeQ-E97DuB!)iYs;@r5m{@l~ zPr#}Qa`aIeC?RNNN-PwQ%A%SKVnNEWB!oCl3(@PH+KZ`QRA)x}hztTi5+Z zM<1;5dLdGDMidsqZ9R&d?*$L}o=a9P3f=9zU1Ah5pzZ5yqVX!a-qduCw;5iukD9yF z2T_OHfKsoONSIVHp@dFgnJE&GZr+x2N3-vjCkFuH0A^IdFhPJwR^2!rV-*8jh&w}f&P_t;M(Ro@S9&0_P;vlJLs)YDmnVX#}CiYX?m$n(|zr`;3cJnjr zci-d9Whl@Jj;CT0$kH+$Ez5f843L~}m^VRy?QI|9E7-O6TI;7My`Q<${u_^}yxHk7 z^D~+6w(R2#yPvaG|5>zq#sAE1y7GXGr>K^`pIN%JG`BPlmq|QNKoh_f0=oR+0|b?h zoNU?Q@xl6gYOG(NtR^G&+@~o6TPOLR6!BjqcnM)ma`klTu%Ac98KS++{@a%DI*E)j z&N!Ih2B`>w?2X>~H04+;4W$6&SZMOWr4S;1_Muae*8T5pg!9~KPBlsV87}z{=QJmo zB(r2*u*_NTzXQI;gV&CAD4gvro3ItY+W`;$kP;0>#6&!;YIZ!{#E8E;rj_886q3a- z#8U|+76z(oSnK~y5)zD|1L`Jh;0+*@t#G{6y;N55y7dRa^RD~ylb>0>2`mc3w}s)m z!tkPH*r+C>)P{z98#NmQV-ma3+gnv3jR#}lcvmW^MARl15&Y^`t$wW<*JumTi}8$$ zq*S~q#AGn6nepy~BgasqAG|;Z5dZ=09L=FB(L_Whs=hIRY80qyj1|_?be6iSyXas0 z6L^WFB62_6K?SX!dYJvvH(b`W$UXAQ^gVXV)NkiZj@RnX)-P7JPSxM$+wSshD<(64 Th+p9d@0mH1Z;i~*=u`d=h<0@C delta 2403 zcmZ`)U2Icj7(S;zr|r&u`m>*IUAuOhV+Dp?1r#MngaH9Ian1`S&~-a!<;<=v?`eUd zWD87Vh{P;kVw5Wq$#B_{85;w^L=(O84wM8uiP1}mUXWq*XY-t+!_ z@89=*Yjf|MZM@mgP$%Hi)OIWN)4)=rUwn6I(~I(K-FTfSD1suTm(KVki=bL(n%J41 zR%zU=y03d!q`f8TTyrgpg0PCO`6zXZ!ZMPpC5ABWRoye5rMm&UuWVLdW!6w-)?C(Z ztkQ0((r!WRRtjm*t$5bF%N7g)U-MCXYTL9$Xj57J;fv0ww){&KmmtO0a5$PP7Q}c7&=b)m7y`RMH*{qyNZ;N_AK1 zcPTxK!g#n8)yus#qk5`VR5PA(2l}e~MwHf9g=m!hW8G2QZyOZrWK;$Mna$g;$Gu1y z&Xk%@XnA!O+VPj%>CFfW!q0Nc`+KhJ`LO4n9J()u?%G1&W3NabG?5u}l%SRUDfNoJ zV!$yX_6Lz0wHkIkm)7$5$%B@IE@C<$j32|6gp>{;w&V!`{8fc+`LpwZZ`s?q&79;f@!GY$cEg90WTE_A=c!C=U?H zbz*GY*CQXI{~?0I>_=Z)ke9)eQ$foriA?gWmP+QeYzB^_N`KMQ%xsbm$qO;&?rbi8 z>0c1LpC)S_-ch6uz%z)3V{$H0$Y}YoXdRqn6CFV}*B}|3A~?#fcI-UCnF%s*<^GPh?7|EPkHZhx3)HKlQK)&E4L5y_;0?oWX zQ}j=;fUka=eHDtba{-2>l{-Hbr(Y-W2?8=4i;9K|lA5k2w#T+ZCA%Y}!51lK5tYrg z_^KNctf)_r;UtTMS|^i4DhN>tritdAauUUxk|OFf$(=ks(1=lS^`G=eFoU3zb@<5x zUiML_)1E=rHFhWT3#RyS*GVzLQ>>B7nAt8k#UhdZdG37zZGp%6zX?r}3eUo3hRw66 z#BR36jJ;BtN)|k9n#^+4zYk7rU>Bk{LB?=#9+}qYS5=;xZa>2-HMQ zn|ecqgr)$=R-{TehVzIzHw2Icu%ZZ#5sZ?O-5eYTPIsaJX(*6{=Sn_wI|7dj_+F4J z>o@=|pzuNQo8Gv%wFSwj1t@64x$m{n(V>xj$5#ZP?ZHjqB2fgtu}ELDp9F?0Q<#mP z%Yve#Z9OS$Ee`jsTcyiHUuBlf`^C%b;O6Ih8cE%8x{y&oRUXkX^oZ_F*hhRZykdb- zc4PCj=wQ1f4Q{(y(xt1})xczm2>=@lN~?T6TT=oEX)Y~> z%;;(Jn4=0Cj-%QnBw@~Qf|}Cwyb6Xit)=nH?+bo6m}fqn(nf=pnMxOQJS7wPWXiDO zK@Z3IhMS@oXfHyJfQHAY)3w=LS|wF;K&W#-bu@EcAgVk=e>r#K;Z{hid*E9XP=WL| Zc4XHm`)rr5`1P(eOQT>BLyrl#)xQ_Q_~rlr diff --git a/inventory/templatetags/custom_filters.py b/inventory/templatetags/custom_filters.py index 93e3ff05..69570a5c 100644 --- a/inventory/templatetags/custom_filters.py +++ b/inventory/templatetags/custom_filters.py @@ -2,6 +2,7 @@ from random import randint from django import template from calendar import month_abbr from django.urls import reverse +from django.utils.formats import number_format from django_ledger.io.io_core import get_localdate,validate_activity from django.conf import settings from django.utils.translation import get_language @@ -352,4 +353,10 @@ def date_picker(context, nav_url=None, date_picker_id=None): @register.filter def splitlines(value): """Splits text into lines""" - return value.splitlines() \ No newline at end of file + return value.splitlines() + +@register.filter(name='currency_format') +def currency_format(value): + if not value: + value = 0.00 + return number_format(value, decimal_pos=2, use_l10n=True, force_grouping=True) \ No newline at end of file diff --git a/inventory/views.py b/inventory/views.py index 08f9fd8f..ccbd3e2f 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -1280,15 +1280,14 @@ class CustomerDetailView(LoginRequiredMixin, DetailView): dealer = get_user_type(self.request) entity = dealer.entity context = super().get_context_data(**kwargs) - # customer = f"{context['customer'].first_name} {context['customer'].middle_name} {context['customer'].last_name}" - # context["estimates"] = entity.get_estimates().filter( - # customer__customer_name=name - # ) + estimates = entity.get_estimates().filter(customer=self.object) invoices = entity.get_invoices().filter(customer=self.object) + # txs = entity. transactions(customer=self.object) total = estimates.count() + invoices.count() context["estimates"] = estimates context["invoices"] = invoices + # context["txs"] = txs context["total"] = total @@ -2632,6 +2631,7 @@ def account_delete(request, pk): # Sales list +@login_required def sales_list_view(request): dealer = get_user_type(request) entity = dealer.entity diff --git a/templates/customers/note_form.html b/templates/customers/note_form.html index 19cd30fe..6e829d3c 100644 --- a/templates/customers/note_form.html +++ b/templates/customers/note_form.html @@ -1,11 +1,7 @@ {% load i18n static crispy_forms_filters %} - -
- + {% csrf_token %} {{ form|crispy }} - - - -
\ No newline at end of file + + \ No newline at end of file diff --git a/templates/customers/view_customer.html b/templates/customers/view_customer.html index cb3ad776..c6bcd194 100644 --- a/templates/customers/view_customer.html +++ b/templates/customers/view_customer.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load i18n static crispy_forms_filters%} +{% load i18n static crispy_forms_filters custom_filters%} {% block title %}{{ _("View Customer") }}{% endblock title %} @@ -41,7 +41,7 @@
-

{{ customer.additional_info }}

+

{{ customer.customer_name }}

{{ customer.created|timesince}}

@@ -105,30 +105,51 @@
-

{{ _("Cars") }} ({{ total }})

+

{{ _("Related") }} ({{ total }})

- - - - - - + + + + + - +{% for estimate in estimates %} - - - - - - + + + + + - +{% endfor %}
ORDERTOTALPAYMENT STATUSFULFILMENT STATUSDELIVERY TYPEDATE{% trans 'Type'|upper %}{% trans 'Total'|upper %}{% trans 'Payment Status'|upper %}{% trans 'Fulfilment Status'|upper %}{% trans 'Date'|upper %}
#2453$87PaidOrder FulfilledCash on deliveryDec 12, 12:56 PM +

{{ estimate.estimate_number }}

+ 		{{ estimate.revenue_estimate|currency_format }} + + Paid + + + + {% if estimate.status == 'draft' %} + {% trans "Draft" %} + {% elif estimate.status == 'in_review' %} + {% trans "In Review" %} + {% elif estimate.status == 'approved' %} + {% trans "Approved" %} + {% elif estimate.status == 'declined' %} + {% trans "Declined" %} + {% elif estimate.status == 'canceled' %} + {% trans "Canceled" %} + {% elif estimate.status == 'completed' %} + {% trans "Completed" %} + {% elif estimate.status == 'void' %} + {% trans "Void" %} + {% endif %} + {{ estimate.created }}
@@ -138,7 +159,7 @@
diff --git a/templates/dashboards/manager.html b/templates/dashboards/manager.html index a6b5f1d0..28b6a58a 100644 --- a/templates/dashboards/manager.html +++ b/templates/dashboards/manager.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% load i18n static %} +{% load i18n static custom_filters %} {% block content %} @@ -132,7 +132,7 @@
-

{{ total_selling_price }} {{ CURRENCY }}

+

{{ total_selling_price|currency_format }} {{ CURRENCY }}

@@ -147,7 +147,7 @@
-

{{ total_profit }} {{ CURRENCY }}

+

{{ total_profit|currency_format }} {{ CURRENCY }}

diff --git a/templates/ledger/reports/dashboard-copy.html b/templates/ledger/reports/dashboard-copy.html index a24843dd..4a61e25b 100644 --- a/templates/ledger/reports/dashboard-copy.html +++ b/templates/ledger/reports/dashboard-copy.html @@ -5,7 +5,6 @@ {% block content %}
-
diff --git a/templates/sales/estimates/estimate_detail.html b/templates/sales/estimates/estimate_detail.html index 3cc9e502..6a59290c 100644 --- a/templates/sales/estimates/estimate_detail.html +++ b/templates/sales/estimates/estimate_detail.html @@ -183,7 +183,7 @@ {% trans "Discount Amount" %} - - {{data.total_discount}} + - {{data.total_discount}} @@ -192,11 +192,11 @@ {% for service in data.additionals %} + {{service.name}} - {{service.total}}
{% endfor %} - + {% trans "Grand Total" %} - + {{data.grand_total}}