From e7ca9d4de3b477b654431968c4f9389305f50baf Mon Sep 17 00:00:00 2001 From: Marwan Alwali Date: Mon, 20 Jan 2025 15:57:32 +0300 Subject: [PATCH] update --- .../__pycache__/settings.cpython-311.pyc | Bin 6501 -> 6859 bytes .../__pycache__/urls.cpython-311.pyc | Bin 1974 -> 2072 bytes car_inventory/urls.py | 1 + inventory/__pycache__/forms.cpython-311.pyc | Bin 31062 -> 31062 bytes .../__pycache__/services.cpython-311.pyc | Bin 4776 -> 4776 bytes inventory/__pycache__/urls.cpython-311.pyc | Bin 21804 -> 21804 bytes inventory/__pycache__/utils.cpython-311.pyc | Bin 10566 -> 10566 bytes inventory/__pycache__/views.cpython-311.pyc | Bin 150225 -> 150225 bytes requirements.txt | 121 ++++++++++-------- templates/inventory/car_form.html | 88 ++++--------- .../bank_accounts/bank_account_list.html | 17 ++- .../ledger/coa_accounts/account_detail.html | 43 ++++--- .../ledger/coa_accounts/account_list.html | 25 ++-- templates/sales/estimates/estimate_list.html | 2 +- templates/sales/journals/journal_list.html | 8 +- 15 files changed, 139 insertions(+), 166 deletions(-) diff --git a/car_inventory/__pycache__/settings.cpython-311.pyc b/car_inventory/__pycache__/settings.cpython-311.pyc index 95c85ce62e452e5a419359f200da9305025b30b8..92b03f6f87df37c9c1dca3356da043e29a0d9cc9 100644 GIT binary patch delta 1009 zcmZ8fOHUI~6uvWUner&5yb1#HrWE8=-V}iWrVr?gwnVv!PD;*DD}6vIQ8A`$+?W_O zvq96igoP{9pWxD%bUB%wQ4?5@G;!f$qqnV?!pZ%<+;h%%&OP_$elvX>H=JlRWr*0% z^XI|SHiW+9oC{O`+k9VmZ?IB*K?-+3N05R}g02*eJE0qQK@aW*1MU$jp!c90A)+#f zZ>esr@t8*F9YMjw6lJLEyBxzt=*N9IwfKwDCbuZu4+HoH4B`P`@F2ku!7vQcNKnJj zF+~~@6l{xz;e34LYCK5e5insBsU3w;JO*Ph4ih1Y@Fd}>lmd^#G@c-sgc&>qW;_kE zI5`71u^Gys1?Gr!K131m9J%WPuqisfTg>m4h_{?l;#uJE&HM=5_@G=3HZ|c2LZUH5>64=PS?4a}^qc1(CIHAN- zWv60f;TS&XD1elCL%&KA*U^s4f%@6g4_ilFBojqlY;%B3L=^fo?Djlh*q?2;#8o%UN_xU-m+{k)7ZoA9x6R%R{Y z)A}E(Y#CC`q@U?C)ZJ_e(zHw3DoLx8G*wbfom5dNmDgsqY7MC*bXc0LMlHP=)F^cf pWKgTr)O<8@bo;eAWzL`m>Du)S(o4;4Bu~0FwGywe;%~?le*rhh8IAw| delta 617 zcmZ8dO-~b16n*c}QfxcaiV8u&NGZbr9j4QkwtTi7O0DvdD4KX<(o}D0h_xi(h9;(N zj7tr(a8nmn%HYRQ7(oT(f*Z#wF2;)7{J~}K z_`YE5GqDX&%tP)s1H#h@V;F$(rj*r-p$!fbI0*sNKt%^k5;bDbEQ!7<>Vg%zFtpF< zUSb;?g0|8z3?T}JF#-{s!YIZzIrTX8=~@R&;S5BHF`R`s&cQU!!wfFKEIM%j6O>GD za>^#?T`4qbqBSkHrZlOgnhlIO%)oqWh0MhjV1ZnLcm8t|n1v+Xg%sWc18onOvTT() z4!Bft1vRxxtwQT(ioacbvz})61`fvS|JGp70y}NyAus zxVoN8uOzd}xku^y*`=(JT+gnpTE{&eVSc!tbH1e?ZvOMm?q2VE@2xAM!Oq+3?ncV| h)cdFVXkfI?`Wv0ht{vIp*2lg&ch#AfYWocxJp-ZHm*@Zh diff --git a/car_inventory/__pycache__/urls.cpython-311.pyc b/car_inventory/__pycache__/urls.cpython-311.pyc index 924bb9fccbf610b1c921e982c84e75fbd68960ed..5f7798e7ee8f558a1b63cad439aa72fbeb0fded2 100644 GIT binary patch delta 177 zcmdnSKSMx$IWI340}yn&_odshFfcp@abQ3I%J_U_qk1qC4--QwbBYp>WJyt;9LFTf z%E7>}nqzVUlP;sms^Up3D9F#uE6GjGE77kKK=3vvuy`^u%57f7 zdXZ801`9`nONZPH@fqS56pb%Rnp}}IxyWLAg~jxvAg2J+7X~2lk%5zuse${0*yKKT F4FDF5E>!>k delta 128 zcmbOsu#I1RIWI340}$-nl9JBO!octt#DM{RDC6^-jq1TnY|Gdg7*?}SUcsa*t+b2@ z$Od8vsN!W{h~iIS4`$F*-u!`S9^>Y9EY6IKESo>EUSt&h$j>3b^o0RPd}QEYWNP64 KATs#_y9NL=VjGtL diff --git a/car_inventory/urls.py b/car_inventory/urls.py index 5aa86968..7b6399d6 100644 --- a/car_inventory/urls.py +++ b/car_inventory/urls.py @@ -23,6 +23,7 @@ urlpatterns += i18n_patterns( path('', include('inventory.urls')), path('ledger/', include('django_ledger.urls', namespace='django_ledger')), path("haikalbot/", include("haikalbot.urls")), + path('appointment/', include('appointment.urls')), ) urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/inventory/__pycache__/forms.cpython-311.pyc b/inventory/__pycache__/forms.cpython-311.pyc index b1ddaf0a9da8b5acd4a336426f47506c57664ed5..121245025add609874d8f80418efdc64a35f2752 100644 GIT binary patch delta 22 ccmcciiSgPeM(*Xjyj%=GAgI#2k=wfx09&&Ls{jB1 delta 22 ccmcciiSgPeM(*Xjyj%=GaB*qpMsDv)0Au9`=l}o! diff --git a/inventory/__pycache__/services.cpython-311.pyc b/inventory/__pycache__/services.cpython-311.pyc index c1979932fb2636a45cababd4e3dbc4bc24b39429..0bc9414bea4781d2c416a3ff8ae3b7a563031867 100644 GIT binary patch delta 20 acmZ3XxzD+B;G-~~7U delta 20 acmZ3Xxn+a delta 22 ccmZ3pigC>WbS#K_IWI340}u$R^ls#~)&u}NWbS#K_IWI340}vc-Yv0IitqA}_{ss8} diff --git a/inventory/__pycache__/views.cpython-311.pyc b/inventory/__pycache__/views.cpython-311.pyc index 0329d79cff354801b7d766ac9935c44338f8514d..b2b0facf122498fa96593c5ad240ffa29eee3a1c 100644 GIT binary patch delta 28 icmcaOmGk0MPVVKryj%=GAgI#Y$lc1#xRsmfm=^$aG6!Y= delta 28 icmcaOmGk0MPVVKryj%=GkhQe4k-L?faVs~|F)sjqmk2xn diff --git a/requirements.txt b/requirements.txt index 3839fa37..ae0ef94c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,25 +3,25 @@ aiohttp==3.11.11 aiohttp-retry==2.8.3 aiosignal==1.3.2 alabaster==1.0.0 -albucore==0.0.13 -albumentations==1.4.10 +albucore==0.0.23 +albumentations==2.0.0 annotated-types==0.7.0 -anyio==4.6.2.post1 +anyio==4.8.0 arabic-reshaper==3.0.0 asgiref==3.8.1 astor==0.8.1 -astroid==3.3.5 +astroid==3.3.8 attrs==23.2.0 -autopep8==2.3.1 -babel==2.16.0 +autopep8==2.3.2 +Babel==2.15.0 beautifulsoup4==4.12.3 bleach==6.2.0 blinker==1.9.0 Brotli==1.1.0 -certifi==2024.8.30 +certifi==2024.12.14 cffi==1.17.1 chardet==5.2.0 -charset-normalizer==3.4.0 +charset-normalizer==3.4.1 click==8.1.8 colorama==0.4.6 commonmark==0.9.1 @@ -29,128 +29,140 @@ contourpy==1.3.1 crispy-bootstrap5==2024.10 cryptography==44.0.0 cssselect2==0.7.0 +ctranslate2==4.5.0 cycler==0.12.1 Cython==3.0.11 decorator==5.1.1 desert==2020.11.18 dill==0.3.9 distro==1.9.0 -dj-rest-auth==7.0.0 +dj-rest-auth==7.0.1 dj-shop-cart==7.1.1 -Django==5.1.4 -django-allauth==65.3.0 +Django==5.1.5 +django-allauth==65.3.1 +django-appointment==3.7.4 django-autoslug==1.9.9 django-bootstrap5==24.3 django-classy-tags==4.1.0 django-cors-headers==4.6.0 django-countries==7.6.1 django-crispy-forms==2.3 -django-debug-toolbar==4.4.6 +django-debug-toolbar==5.0.1 django-extensions==3.2.3 django-filter==24.3 django-formtools==2.5.1 -django-ledger==0.7.0 +django-ledger==0.7.3 django-money==3.5.3 django-nine==0.2.7 django-nonefield==0.4 django-phonenumber-field==8.0.0 +django-picklefield==3.2 django-prometheus==2.3.1 +django-q2==1.7.6 django-sekizai==4.1.0 -django-silk==5.3.1 +django-silk==5.3.2 django-sms==0.7.0 django-sslserver==0.22 -django-tables2==2.7.0 +django-tables2==2.7.5 django-treebeard==4.7.1 django-view-breadcrumbs==2.5.1 djangocms-admin-style==3.3.1 djangorestframework==3.15.2 -djangorestframework-simplejwt==5.3.1 +djangorestframework_simplejwt==5.4.0 djangoviz==0.1.1 docutils==0.21.2 easy-thumbnails==2.10 et_xmlfile==2.0.0 -Faker==33.1.0 +Faker==33.3.1 +filelock==3.16.1 fire==0.7.0 Flask==3.1.0 fonttools==4.55.3 frozenlist==1.5.0 +fsspec==2024.12.0 gprof2dot==2024.6.6 graphqlclient==0.2.4 greenlet==3.1.1 h11==0.14.0 +h2==4.1.0 +hpack==4.0.0 +hstspreload==2025.1.1 httpcore==1.0.7 -httpx==0.28.0 +httpx==0.28.1 +hyperframe==6.0.1 idna==3.10 -imageio==2.36.1 +imageio==2.37.0 imagesize==1.4.1 imgaug==0.4.0 iso4217==1.12.20240625 isodate==0.7.2 isort==5.13.2 itsdangerous==2.2.0 -Jinja2==3.1.4 -jiter==0.8.0 +Jinja2==3.1.5 +jiter==0.8.2 joblib==1.4.2 kiwisolver==1.4.8 lazy_loader==0.4 ledger==1.0.1 +libretranslatepy==2.1.4 lmdb==1.6.2 lxml==5.3.0 Markdown==3.7 markdown-it-py==3.0.0 MarkupSafe==3.0.2 -marshmallow==3.23.2 +marshmallow==3.25.1 matplotlib==3.10.0 mccabe==0.7.0 mdurl==0.1.2 MouseInfo==0.1.3 +mpmath==1.3.0 multidict==6.1.0 mypy-extensions==1.0.0 networkx==3.4.2 -newrelic==10.3.1 +newrelic==10.4.0 nltk==3.9.1 -numpy==1.26.4 +libquadmath==2.2.2 oauthlib==3.2.2 ofxtools==0.9.5 -openai==1.56.2 -opencv-contrib-python==4.10.0.84 -opencv-python==4.10.0.84 -opencv-python-headless==4.10.0.84 +openai==1.59.8 +opencv-contrib-python==4.11.0.86 +opencv-python==4.11.0.86 +opencv-python-headless==4.11.0.86 openpyxl==3.1.5 -opt-einsum==3.3.0 +opt_einsum==3.4.0 outcome==1.3.0.post0 packaging==24.2 pandas==2.2.3 pango==0.0.1 pdfkit==1.0.0 -phonenumbers==8.13.51 -pillow==11.0.0 +phonenumbers==8.13.53 +pillow==11.1.0 platformdirs==4.3.6 prometheus_client==0.21.1 propcache==0.2.1 protobuf==5.29.3 -psycopg==3.2.3 -psycopg-binary==3.2.3 -psycopg-c==3.2.3 +psycopg==3.2.4 +psycopg-binary==3.2.4 +psycopg-c==3.2.4 py-moneyed==3.0 PyAutoGUI==0.9.54 pyclipper==1.3.0.post6 pycodestyle==2.12.1 pycparser==2.22 -pydantic==2.10.3 -pydantic_core==2.27.1 +pydantic==2.10.5 +pydantic_core==2.27.2 pydotplus==2.0.2 pydyf==0.11.0 PyGetWindow==0.0.9 -Pygments==2.18.0 +Pygments==2.19.1 PyJWT==2.10.1 -pylint==3.3.2 +pylint==3.3.3 PyMsgBox==1.0.9 PyMySQL==1.1.1 -pyobjc-core==10.3.2 -pyobjc-framework-Cocoa==10.3.2 -pyobjc-framework-Quartz==10.3.2 -pyparsing==3.2.0 +pyobjc-core==11.0 +pyobjc-framework-Cocoa==11.0 +pyobjc-framework-Quartz==11.0 +pyparsing==3.2.1 pyperclip==1.9.0 pyphen==0.17.0 pypng==0.20220715.0 @@ -166,30 +178,36 @@ python3-saml==1.16.0 pytweening==1.2.0 pytz==2024.2 pyvin==0.0.2 -pywa==2.4.0 +pywa==2.7.0 pywhat==5.1.0 pywhatkit==5.4 PyYAML==6.0.2 +pyzbar==0.1.9 qrcode==8.0 RapidFuzz==3.11.0 regex==2024.11.6 reportlab==4.2.5 requests==2.32.3 requests-oauthlib==2.0.0 +rfc3986==2.0.0 rich==13.9.4 -rubicon-objc==0.4.9 +rubicon-objc==0.5.0 +sacremoses==0.1.1 scikit-image==0.25.0 -scikit-learn==1.6.0 -scipy==1.14.1 +libomp runtime library==1.6.1 +libquadmath==1.15.1 selenium==4.27.1 +sentencepiece==0.2.0 shapely==2.0.6 -six==1.16.0 +six==1.17.0 sniffio==1.3.1 snowballstemmer==2.2.0 sortedcontainers==2.4.0 soupsieve==2.6 -SQLAlchemy==2.0.36 -sqlparse==0.5.2 +SQLAlchemy==2.0.37 +sqlparse==0.5.3 +stanza==1.10.1 +sympy==1.13.1 tablib==3.7.0 termcolor==2.5.0 threadpoolctl==3.5.0 @@ -198,16 +216,17 @@ tinycss2==1.4.0 tinyhtml5==2.0.0 tomli==2.2.1 tomlkit==0.13.2 +torch==2.5.1 tqdm==4.67.1 trio==0.28.0 trio-websocket==0.11.1 -twilio==9.4.1 +twilio==9.4.3 typing-inspect==0.9.0 typing_extensions==4.12.2 tzdata==2024.2 Unidecode==1.3.8 upgrade-requirements==1.7.0 -urllib3==2.2.3 +urllib3==2.3.0 vin==0.6.2 vininfo==1.8.0 vishap==0.1.5 diff --git a/templates/inventory/car_form.html b/templates/inventory/car_form.html index 5cc20970..8c20ac04 100644 --- a/templates/inventory/car_form.html +++ b/templates/inventory/car_form.html @@ -6,9 +6,7 @@ height: auto; margin: 0 auto; } - -{% include 'partials/form_errors.html' %} @@ -17,24 +15,25 @@
{% csrf_token %} + {% include 'partials/form_errors.html' %}
-
-

{% trans 'Add Car' %}

+

{% trans 'Add Car' %}

+
-
- - -
+
+ + +
-
- - - - -
+ + +
-
@@ -107,17 +102,16 @@
-
-
+
- -
-
- + +
@@ -145,15 +137,9 @@ {% trans 'Vendor' %}
- {% if form.vendor.errors %} -
- {{ form.vendor.errors|striptags }} -
- {% endif %}
-
@@ -164,12 +150,6 @@ {% trans 'Stock Type'|capfirst %}
- - {% if form.stock_type.errors %} -
- {{ form.stock_type.errors|striptags }} -
- {% endif %}
@@ -181,11 +161,6 @@ {{ form.mileage|add_class:"form-control form-control-sm" }}
- {% if form.mileage.errors %} -
- {{ form.mileage.errors|striptags }} -
- {% endif %}
@@ -201,12 +176,6 @@ {% trans 'Receiving Date' %}: - {% if form.receiving_date.errors %} -
- {{ form.receiving_date.errors|striptags }} -
- {% endif %} - @@ -221,21 +190,13 @@ {{ form.remarks|add_class:"form-control form-control-sm" }} - {% if form.remarks.errors %} -
- {{ form.remarks.errors|striptags }} -
- {% endif %} - - - +
- @@ -243,7 +204,6 @@ {% trans "Save and Go to Inventory" %}
- @@ -264,7 +224,6 @@ - @@ -318,7 +277,7 @@ - + -