diff --git a/.DS_Store b/.DS_Store index e0094cba..142e5f91 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/inventory/__pycache__/forms.cpython-311.pyc b/inventory/__pycache__/forms.cpython-311.pyc index f69735c7..bf9df5b5 100644 Binary files a/inventory/__pycache__/forms.cpython-311.pyc and b/inventory/__pycache__/forms.cpython-311.pyc differ diff --git a/inventory/__pycache__/models.cpython-311.pyc b/inventory/__pycache__/models.cpython-311.pyc index 24ef713d..b6987177 100644 Binary files a/inventory/__pycache__/models.cpython-311.pyc and b/inventory/__pycache__/models.cpython-311.pyc differ diff --git a/inventory/__pycache__/urls.cpython-311.pyc b/inventory/__pycache__/urls.cpython-311.pyc index 6206ea0f..e5a202ad 100644 Binary files a/inventory/__pycache__/urls.cpython-311.pyc and b/inventory/__pycache__/urls.cpython-311.pyc differ diff --git a/inventory/__pycache__/utils.cpython-311.pyc b/inventory/__pycache__/utils.cpython-311.pyc index bf1e6244..3505e7d5 100644 Binary files a/inventory/__pycache__/utils.cpython-311.pyc and b/inventory/__pycache__/utils.cpython-311.pyc differ diff --git a/inventory/__pycache__/views.cpython-311.pyc b/inventory/__pycache__/views.cpython-311.pyc index 837ff834..b1e9ada4 100644 Binary files a/inventory/__pycache__/views.cpython-311.pyc and b/inventory/__pycache__/views.cpython-311.pyc differ diff --git a/locale/ar/LC_MESSAGES/django.mo b/locale/ar/LC_MESSAGES/django.mo index ec5c7523..dfa79f5a 100644 Binary files a/locale/ar/LC_MESSAGES/django.mo and b/locale/ar/LC_MESSAGES/django.mo differ diff --git a/locale/ar/LC_MESSAGES/django.po b/locale/ar/LC_MESSAGES/django.po index 6817aa54..1e3a9e4f 100644 --- a/locale/ar/LC_MESSAGES/django.po +++ b/locale/ar/LC_MESSAGES/django.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-02-11 05:34+0300\n" +"POT-Creation-Date: 2025-02-11 15:29+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -45,9 +45,6 @@ msgstr "رقم الهيكل" #: templates/sales/invoices/invoice_detail.html:86 #: templates/sales/invoices/invoice_detail.html:138 #: templates/sales/invoices/invoice_detail.html:140 -#: templates/sales/invoices/invoice_preview.html:232 -#: templates/sales/invoices/invoice_preview.html:236 -#: templates/sales/invoices/invoice_preview.html:243 #: templates/subscriptions/subscription_plan.html:41 msgid "SAR" msgstr "ريال" @@ -374,7 +371,7 @@ msgstr "تمت الموافقة" #: inventory/models.py:263 inventory/models.py:956 #: templates/crm/leads/lead_detail.html:46 -#: templates/crm/leads/lead_list.html:125 +#: templates/crm/leads/lead_list.html:120 msgid "Pending" msgstr "قيد الانتظار" @@ -424,7 +421,7 @@ msgstr "نقل" #: inventory/models.py:279 inventory/models.py:955 #: templates/crm/leads/lead_detail.html:44 -#: templates/crm/leads/lead_list.html:123 +#: templates/crm/leads/lead_list.html:118 #: templates/inventory/car_inventory.html:68 msgid "New" msgstr "جديد" @@ -987,17 +984,17 @@ msgid "Form" msgstr "نموذج" #: inventory/models.py:957 templates/crm/leads/lead_detail.html:48 -#: templates/crm/leads/lead_list.html:127 +#: templates/crm/leads/lead_list.html:122 msgid "In Progress" msgstr "قيد التنفيذ" #: inventory/models.py:958 templates/crm/leads/lead_detail.html:50 -#: templates/crm/leads/lead_list.html:129 +#: templates/crm/leads/lead_list.html:124 msgid "Qualified" msgstr "مؤهل" #: inventory/models.py:959 templates/crm/leads/lead_detail.html:52 -#: templates/crm/leads/lead_list.html:131 +#: templates/crm/leads/lead_list.html:126 #: templates/sales/estimates/estimate_list.html:37 #: templates/sales/invoices/invoice_list.html:34 #: venv/lib/python3.11/site-packages/django_ledger/models/bill.py:347 @@ -1291,7 +1288,7 @@ msgstr "ملاحظة" #: inventory/models.py:1337 inventory/models.py:1350 #: templates/crm/leads/lead_detail.html:128 #: templates/crm/leads/lead_detail.html:181 -#: templates/crm/leads/lead_detail.html:595 +#: templates/crm/leads/lead_detail.html:583 #: templates/customers/view_customer.html:119 #: venv/lib/python3.11/site-packages/django_ledger/forms/bill.py:154 #: venv/lib/python3.11/site-packages/django_ledger/templates/django_ledger/includes/card_markdown.html:9 @@ -1674,159 +1671,159 @@ msgstr "رقم الهيكل موجود مسبقاً" msgid "inventory" msgstr "المخزون" -#: inventory/views.py:767 +#: inventory/views.py:800 msgid "Car finance details saved successfully." msgstr "تم حفظ تفاصيل المالية للسيارة بنجاح." -#: inventory/views.py:799 +#: inventory/views.py:832 msgid "Car finance details updated successfully." msgstr "تم تحديث تفاصيل المالية للسيارة بنجاح." -#: inventory/views.py:828 +#: inventory/views.py:861 msgid "Car updated successfully." msgstr "تم تحديث السيارة بنجاح" -#: inventory/views.py:840 +#: inventory/views.py:873 msgid "Car deleted successfully." msgstr "تم حذف السيارة بنجاح." -#: inventory/views.py:919 +#: inventory/views.py:952 msgid "Car transfer canceled successfully." msgstr "تم إلغاء نقل السيارة بنجاح." -#: inventory/views.py:936 +#: inventory/views.py:969 msgid "Car transfer approved successfully." msgstr "تمت الموافقة على نقل السيارة بنجاح." -#: inventory/views.py:947 +#: inventory/views.py:980 msgid "Car transfer rejected successfully." msgstr "تم رفض نقل السيارة بنجاح." -#: inventory/views.py:960 +#: inventory/views.py:993 msgid "Car Transfer Completed successfully." msgstr "تم إكمال نقل السيارة بنجاح." -#: inventory/views.py:1031 +#: inventory/views.py:1064 msgid "Custom Card added successfully." msgstr "تم إضافة البطاقة الجمركية بنجاح." -#: inventory/views.py:1051 +#: inventory/views.py:1084 msgid "Registration added successfully." msgstr "تم إلغاء الحجز بنجاح." -#: inventory/views.py:1060 +#: inventory/views.py:1093 msgid "This car is already reserved." msgstr "هذه السيارة محجوزة بالفعل." -#: inventory/views.py:1080 +#: inventory/views.py:1113 msgid "Reservation renewed successfully." msgstr "تم تجديد الحجز بنجاح" -#: inventory/views.py:1088 +#: inventory/views.py:1121 msgid "Reservation canceled successfully." msgstr "تم إلغاء الحجز بنجاح." -#: inventory/views.py:1093 +#: inventory/views.py:1126 msgid "Invalid action." msgstr "إجراء غير صالح." -#: inventory/views.py:1097 +#: inventory/views.py:1130 msgid "Invalid request method." msgstr "طريقة الطلب غير صالحة" -#: inventory/views.py:1119 +#: inventory/views.py:1152 msgid "Dealer updated successfully." msgstr "تم تحديث المعرض بنجاح." -#: inventory/views.py:1139 templates/header.html:162 +#: inventory/views.py:1172 templates/header.html:162 msgid "customers" msgstr "العملاء" -#: inventory/views.py:1249 +#: inventory/views.py:1282 msgid "Customer created successfully." msgstr "تم إنشاء العميل بنجاح." -#: inventory/views.py:1281 +#: inventory/views.py:1314 msgid "Customer updated successfully." msgstr "تم تحديث العميل بنجاح." -#: inventory/views.py:1296 +#: inventory/views.py:1329 msgid "Customer deleted successfully." msgstr "تم حذف العميل بنجاح." -#: inventory/views.py:1331 +#: inventory/views.py:1364 msgid "Vendor created successfully." msgstr "تم إنشاء المورد بنجاح." -#: inventory/views.py:1351 +#: inventory/views.py:1384 msgid "Vendor updated successfully." msgstr "تم تحديث المورد بنجاح" -#: inventory/views.py:1359 +#: inventory/views.py:1392 msgid "Vendor deleted successfully." msgstr "تم حذف المورد بنجاح." -#: inventory/views.py:1767 +#: inventory/views.py:1800 msgid "User created successfully." msgstr "تم إنشاء المستخدم بنجاح." -#: inventory/views.py:1792 +#: inventory/views.py:1825 msgid "User updated successfully." msgstr "تم تحديث المستخدم بنجاح" -#: inventory/views.py:1803 +#: inventory/views.py:1836 msgid "User deleted successfully." msgstr "تم حذف المستخدم بنجاح." -#: inventory/views.py:1873 inventory/views.py:1903 +#: inventory/views.py:1906 inventory/views.py:1936 msgid "Organization created successfully." msgstr "تم إنشاء المنظمة بنجاح." -#: inventory/views.py:3096 +#: inventory/views.py:3139 msgid "Note deleted successfully." msgstr "تم حذف الملاحظة بنجاح." -#: inventory/views.py:3282 +#: inventory/views.py:3325 msgid "Opportunity deleted successfully." msgstr "تم حذف الفرصة بنجاح." -#: inventory/views.py:3319 +#: inventory/views.py:3362 msgid "Notification marked as read." msgstr "تم تمييز الإشعار كمقروء." -#: inventory/views.py:3345 +#: inventory/views.py:3388 msgid "Service created successfully." msgstr "تم إنشاء الخدمة بنجاح." -#: inventory/views.py:3361 +#: inventory/views.py:3404 msgid "Service updated successfully." msgstr "تم تحديث الخدمة بنجاح." -#: inventory/views.py:3478 inventory/views.py:3503 +#: inventory/views.py:3521 inventory/views.py:3546 msgid "Bill updated successfully." msgstr "تم تحديث الفاتورة بنجاح." -#: inventory/views.py:3529 +#: inventory/views.py:3572 msgid "Bill is already approved." msgstr "تمت الموافقة على الفاتورة مسبقًا." -#: inventory/views.py:3533 +#: inventory/views.py:3576 msgid "Bill marked as approved successfully." msgstr "تم تحديد الفاتورة كموافقة بنجاح." -#: inventory/views.py:3542 +#: inventory/views.py:3585 msgid "Bill is already paid." msgstr "تم دفع الفاتورة مسبقًا." -#: inventory/views.py:3551 +#: inventory/views.py:3594 msgid "Bill marked as paid successfully." msgstr "تم تحديد الفاتورة كمدفوعة بنجاح." -#: inventory/views.py:3553 +#: inventory/views.py:3596 msgid "Amount paid is not equal to amount due." msgstr "المبلغ المدفوع لا يساوي المبلغ المستحق." -#: inventory/views.py:3963 templates/header.html:267 +#: inventory/views.py:4006 templates/header.html:267 #: venv/lib/python3.11/site-packages/django_ledger/templates/django_ledger/unit/unit_detail.html:23 #: venv/lib/python3.11/site-packages/django_ledger/views/entity.py:210 msgid "Dashboard" @@ -2765,16 +2762,14 @@ msgstr "تأكيد الحذف" #: templates/administration/service_list.html:13 #: templates/administration/staff_index.html:79 #: templates/administration/user_profile.html:18 -#: templates/crm/leads/lead_detail.html:206 -#: templates/crm/leads/lead_detail.html:214 -#: templates/crm/leads/lead_list.html:180 +#: templates/crm/leads/lead_list.html:95 templates/crm/leads/lead_list.html:175 #: ⁨templates/crm/opportunities/opportunity_list copy.html⁩:28 -#: templates/customers/customer_list.html:127 #: templates/customers/view_customer.html:51 #: templates/ledger/bank_accounts/bank_account_detail.html:63 #: templates/ledger/bills/bill_list.html:98 #: templates/ledger/coa_accounts/account_detail.html:118 #: templates/ledger/coa_accounts/account_list.html:110 +#: templates/modal/delete_modal.html:12 templates/modal/delete_modal.html:26 #: templates/modal/event_details_modal.html:33 #: templates/organizations/organization_detail.html:17 #: templates/organizations/organization_list.html:130 @@ -3514,7 +3509,7 @@ msgid "City" msgstr "المدينة" #: templates/crm/leads/lead_detail.html:129 -#: templates/crm/leads/lead_detail.html:247 +#: templates/crm/leads/lead_detail.html:234 msgid "Emails" msgstr "رسائل البريد الإلكتروني" @@ -3535,11 +3530,7 @@ msgstr "تم الإنشاء بواسطة" msgid "Created On" msgstr "تم الإنشاء في" -#: templates/crm/leads/lead_detail.html:210 -msgid "Are you sure you want to delete this note?" -msgstr "هل أنت متأكد أنك تريد حذف هذه الملاحظة؟" - -#: templates/crm/leads/lead_detail.html:230 +#: templates/crm/leads/lead_detail.html:213 #: templates/crm/leads/schedule_lead.html:5 templates/crm/note_form.html:13 #: templates/customers/view_customer.html:54 #: templates/items/expenses/expenses_list.html:34 @@ -3589,7 +3580,7 @@ msgstr "هل أنت متأكد أنك تريد حذف هذه الملاحظة؟" msgid "Update" msgstr "تحديث" -#: templates/crm/leads/lead_detail.html:625 +#: templates/crm/leads/lead_detail.html:613 #: templates/inventory/car_detail.html:473 msgid "Error loading form. Please try again later" msgstr "حدث خطأ أثناء تحميل النموذج. يرجى المحاولة مرة أخرى لاحقًا." @@ -3621,42 +3612,11 @@ msgstr "مُعين إلى" msgid "Create date" msgstr "تاريخ الإنشاء" -#: templates/crm/leads/lead_list.html:96 -msgid "Delete Lead" -msgstr "حذف العميل المحتمل" - -#: templates/crm/leads/lead_list.html:103 +#: templates/crm/leads/lead_list.html:99 msgid "Are you sure you want to delete this lead?" msgstr "هل أنت متأكد أنك تريد حذف هذا العميل المحتمل؟" -#: templates/crm/leads/lead_list.html:106 -#: ⁨templates/crm/opportunities/opportunity_list copy.html⁩:155 -#: templates/customers/customer_list.html:93 -#: templates/customers/view_customer.html:26 -#: templates/inventory/car_detail.html:402 -#: templates/inventory/transfer_details.html:24 -#: templates/inventory/transfer_details.html:46 -#: templates/ledger/bank_accounts/bank_account_detail.html:26 -#: templates/ledger/bills/bill_detail.html:20 -#: templates/ledger/bills/bill_detail.html:45 -#: templates/ledger/bills/bill_detail.html:123 -#: templates/ledger/bills/bill_list.html:68 -#: templates/ledger/coa_accounts/account_detail.html:18 -#: templates/ledger/coa_accounts/account_list.html:75 -#: templates/organizations/organization_list.html:97 -#: templates/sales/estimates/estimate_detail.html:20 -#: templates/sales/invoices/invoice_detail.html:20 -#: templates/sales/invoices/invoice_detail.html:45 -#: templates/sales/invoices/invoice_detail.html:121 -#: templates/users/user_detail.html:27 templates/vendors/vendors_list.html:97 -#: templates/vendors/view_vendor.html:29 -#: venv/lib/python3.11/site-packages/appointment/models.py:530 -#: venv/lib/python3.11/site-packages/appointment/tests/models/test_appointment.py:62 -#: venv/lib/python3.11/site-packages/django/forms/widgets.py:802 -msgid "No" -msgstr "لا" - -#: templates/crm/leads/lead_list.html:109 +#: templates/crm/leads/lead_list.html:103 #: ⁨templates/crm/opportunities/opportunity_list copy.html⁩:158 #: templates/customers/view_customer.html:31 #: templates/inventory/car_detail.html:407 @@ -3680,9 +3640,8 @@ msgstr "لا" msgid "Yes" msgstr "نعم" -#: templates/crm/leads/lead_list.html:173 +#: templates/crm/leads/lead_list.html:168 #: ⁨templates/crm/opportunities/opportunity_list copy.html⁩:27 -#: templates/customers/customer_list.html:126 #: templates/dealers/dealer_detail.html:24 #: templates/inventory/car_detail.html:137 #: templates/inventory/car_detail.html:185 @@ -3702,15 +3661,15 @@ msgstr "نعم" msgid "Edit" msgstr "تحديث" -#: templates/crm/leads/lead_list.html:174 +#: templates/crm/leads/lead_list.html:169 msgid "Send Email" msgstr "إرسال البريد الإلكتروني" -#: templates/crm/leads/lead_list.html:175 +#: templates/crm/leads/lead_list.html:170 msgid "Set Schedule" msgstr "تحديد الجدولة" -#: templates/crm/leads/lead_list.html:177 +#: templates/crm/leads/lead_list.html:172 msgid "Convert To Customer" msgstr "تحويل إلى عميل" @@ -3820,6 +3779,31 @@ msgstr "حذف الفرصة" msgid "Are you sure you want to delete this opportunity?" msgstr "هل أنت متأكد أنك تريد حذف هذه الفرصة؟" +#: ⁨templates/crm/opportunities/opportunity_list copy.html⁩:155 +#: templates/customers/view_customer.html:26 +#: templates/inventory/car_detail.html:402 +#: templates/inventory/transfer_details.html:24 +#: templates/inventory/transfer_details.html:46 +#: templates/ledger/bank_accounts/bank_account_detail.html:26 +#: templates/ledger/bills/bill_detail.html:20 +#: templates/ledger/bills/bill_detail.html:45 +#: templates/ledger/bills/bill_detail.html:123 +#: templates/ledger/bills/bill_list.html:68 +#: templates/ledger/coa_accounts/account_detail.html:18 +#: templates/ledger/coa_accounts/account_list.html:75 +#: templates/organizations/organization_list.html:97 +#: templates/sales/estimates/estimate_detail.html:20 +#: templates/sales/invoices/invoice_detail.html:20 +#: templates/sales/invoices/invoice_detail.html:45 +#: templates/sales/invoices/invoice_detail.html:121 +#: templates/users/user_detail.html:27 templates/vendors/vendors_list.html:97 +#: templates/vendors/view_vendor.html:29 +#: venv/lib/python3.11/site-packages/appointment/models.py:530 +#: venv/lib/python3.11/site-packages/appointment/tests/models/test_appointment.py:62 +#: venv/lib/python3.11/site-packages/django/forms/widgets.py:802 +msgid "No" +msgstr "لا" + #: templates/customers/customer_form.html:15 msgid "Edit Customer" msgstr "تحديث العميل" @@ -3833,19 +3817,14 @@ msgstr "إضافة عميل" msgid "Enter customer name" msgstr "أدخل اسم العميل" -#: templates/customers/customer_list.html:83 -msgid "Delete Customer" -msgstr "حذف العميل" - -#: templates/customers/customer_list.html:90 -#: templates/customers/view_customer.html:19 -msgid "Are you sure you want to delete this customer?" -msgstr "هل أنت متأكد أنك تريد حذف هذا العميل؟" - #: templates/customers/view_customer.html:4 templates/users/user_detail.html:5 msgid "View Customer" msgstr "عرض العميل" +#: templates/customers/view_customer.html:19 +msgid "Are you sure you want to delete this customer?" +msgstr "هل أنت متأكد أنك تريد حذف هذا العميل؟" + #: templates/customers/view_customer.html:44 msgid "Customer details" msgstr "تفاصيل العميل" @@ -10955,12 +10934,15 @@ msgstr "إدخال دفتر اليومية المرتبط بهذه المعام msgid "Account from Chart of Accounts to be associated with this transaction." msgstr "الحساب من مخطط الحسابات المرتبط بهذه المعاملة." +#: venv/lib/python3.11/site-packages/django_ledger/models/transactions.py:448 msgid "Amount of the transaction." msgstr "مبلغ المعاملة." +#: venv/lib/python3.11/site-packages/django_ledger/models/transactions.py:455 msgid "Transaction Description" msgstr "وصف المعاملة" +#: venv/lib/python3.11/site-packages/django_ledger/models/transactions.py:456 msgid "A description to be included with this individual transaction." msgstr "وصف يتم تضمينه مع هذه المعاملة الفردية." @@ -12175,7 +12157,9 @@ msgstr "تحديث عنصر المخزون" #: venv/lib/python3.11/site-packages/django_ledger/views/journal_entry.py:110 msgid "Locked Journal Entry. Must unlock ledger to add new Journal Entries." -msgstr "إدخال دفتر اليومية مقفل. يجب إلغاء قفل دفتر الأستاذ لإضافة إدخالات جديدة في دفتر اليومية." +msgstr "" +"إدخال دفتر اليومية مقفل. يجب إلغاء قفل دفتر الأستاذ لإضافة إدخالات جديدة في " +"دفتر اليومية." #: venv/lib/python3.11/site-packages/django_ledger/views/journal_entry.py:131 msgid "Update Journal Entry" @@ -12291,6 +12275,15 @@ msgstr "س" msgid "y" msgstr "ص" +#~ msgid "Are you sure you want to delete this note?" +#~ msgstr "هل أنت متأكد أنك تريد حذف هذه الملاحظة؟" + +#~ msgid "Delete Lead" +#~ msgstr "حذف العميل المحتمل" + +#~ msgid "Delete Customer" +#~ msgstr "حذف العميل" + #~ msgid "OTP verified successfully!" #~ msgstr "تم التحقق من رمز التحقق بنجاح!" diff --git a/static/images/.DS_Store b/static/images/.DS_Store index 9cf7553a..424c00d1 100644 Binary files a/static/images/.DS_Store and b/static/images/.DS_Store differ diff --git a/templates/inventory/car_detail.html b/templates/inventory/car_detail.html index f559c61d..e514ae7a 100644 --- a/templates/inventory/car_detail.html +++ b/templates/inventory/car_detail.html @@ -149,15 +149,15 @@ {% if car.finances %} {% trans "Cost Price"|capfirst %} - {{ car.finances.cost_price }} + {{ car.finances.cost_price|floatformat:2 }} {% trans "Selling Price"|capfirst %} - {{ car.finances.selling_price }} + {{ car.finances.selling_price|floatformat:2 }} {% trans "Discount Amount"|capfirst %} - {{ car.finances.discount_amount }} - + {{ car.finances.discount_amount|floatformat:2 }} - {% trans "Additional Fee"|capfirst %} @@ -167,17 +167,17 @@ {% for service in car.finances.additional_services.all %} {{service.name}} - {{ service.price_ }} + {{ service.price_|floatformat:2 }} {% endfor %} {% endif %} {% trans "VAT Amount"|capfirst %} - {{ car.finances.vat_amount }} + {{ car.finances.vat_amount|floatformat:2 }} {% trans "Total"|capfirst %} - {{ car.finances.total_vat }} + {{ car.finances.total_vat|floatformat:2 }} diff --git a/templates/ledger/bills/bill_detail.html b/templates/ledger/bills/bill_detail.html index 348b33dd..b7e3ad78 100644 --- a/templates/ledger/bills/bill_detail.html +++ b/templates/ledger/bills/bill_detail.html @@ -84,8 +84,8 @@

{% trans 'Paid Amount' %}

-

${{bill.amount_paid}}

-
Owned ${{bill.get_amount_open}}
+

{{bill.amount_paid}} {{ CURRENCY }}

+
Owned {{bill.get_amount_open}} {{ CURRENCY }}
{{bill.get_progress_percent}}%
@@ -137,9 +137,9 @@

{% trans 'Due Amount' %}

{% if bill.is_paid %} -

${{bill.amount_due}}

+

{{bill.amount_due}} {{ CURRENCY }}

 {% else %} -

${{bill.amount_due}}

+

{{bill.amount_due}} {{ CURRENCY }}

{% endif %}
diff --git a/templates/sales/estimates/sale_order_form.html b/templates/sales/estimates/sale_order_form.html index 262fe9b1..49dd5068 100644 --- a/templates/sales/estimates/sale_order_form.html +++ b/templates/sales/estimates/sale_order_form.html @@ -95,7 +95,7 @@ : -

${{ data.total_discount }}

+

{{ data.total_discount }} {{ CURRENCY }}

@@ -109,7 +109,7 @@ : -

${{ data.grand_total }}

+

{{ data.grand_total }} {{ CURRENCY }}

@@ -158,7 +158,7 @@ {{car.year}}
- ${{car.total}} + {{car.total}} {{ CURRENCY }}
diff --git a/templates/sales/estimates/sale_order_preview.html b/templates/sales/estimates/sale_order_preview.html index eecde802..9f3ee0f6 100644 --- a/templates/sales/estimates/sale_order_preview.html +++ b/templates/sales/estimates/sale_order_preview.html @@ -260,18 +260,18 @@
-

{% trans "VAT" %} ({{vat}}%): ${{data.vat}}

+

{% trans "VAT" %} ({{vat}}%): {{data.vat}} {{ CURRENCY }}

{% trans "Additional Services" %}:
{% for service in data.additional_services %} - {{service.name}} - ${{service.price}}
+ {{service.name}} - {{service.price}} {{ CURRENCY }}
{% endfor %}

-

{%trans "Total Amount" %}: ${{data.grand_total}}

+

{%trans "Total Amount" %}: {{data.grand_total}} {{ CURRENCY }}

diff --git a/templates/sales/invoices/invoice_preview.html b/templates/sales/invoices/invoice_preview.html index 4e405b9a..5f8993f4 100644 --- a/templates/sales/invoices/invoice_preview.html +++ b/templates/sales/invoices/invoice_preview.html @@ -15,7 +15,7 @@ body { font-family: 'Roboto', sans-serif; margin: 0; - padding: 0; + padding: 10mm; background-color: #f8f9fa; } .invoice-container { @@ -40,6 +40,7 @@ .qr-code img { width: 3cm; height: 3cm; + border-radius: 0.3333333333rem; } .invoice-details, .invoice-table { font-size: 12px; @@ -66,96 +67,175 @@ -
-
-
Tax Invoice / فاتورة ضريبية
+ +
+
+
-
- QR Code +
+ +
+
+
-
- - - - - - -
{{ dealer.name }}{{ dealer.arabic_name }}
Address{{ dealer.address }}العنوان
Phone{{ dealer.phone_number }}جوال
VAT Number{{ dealer.vrn }}الرقم الضريبي
-
+ +
+
+
Tax Invoice / فاتورة ضريبية
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ QR Code +
+ 		+
+ Dealer Logo +
+
{{ dealer.name }}{{ dealer.arabic_name }}
Address{{ dealer.address }}العنوان
Phone{{ dealer.phone_number }}جوال
VAT Number{{ dealer.vrn }}الرقم الضريبي
+
+
- - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Invoice Number{{ invoice.invoice_number }}رقم الفاتورة
Date{{ invoice.date_in_review }}التاريخ
Customer{{ invoice.customer.customer_name }}العميل
VAT Numberالرقم الضريبي
Email{{ invoice.customer.email }}البريد الالكتروني
Terms{{ invoice.get_terms_display }}طريقة الدفع
Invoice Number{{ invoice.invoice_number }}رقم الفاتورة
Date{{ invoice.date_in_review| date:"Y/m/d" }}التاريخ
Customer{{ invoice.customer.customer_name }}العميل
VAT Number{{ invoice.customer.vrn|default:"-" }}الرقم الضريبي
Email{{ invoice.customer.email|default:"N/A" }}البريد الالكتروني
Terms{{ invoice.get_terms_display }}طريقة الدفع
+
+ Car Details + تفاصيل السيارة +
- - - - - - - - - + + + + + + + + + + {% for item in data.cars %} - - - - - - - - + + + + + + + {% endfor %} + + + + + +
Make / الصانعModel / الموديلYear / السنةVIN / الهيكلQuantity / الكميةUnit Price / سعر الوحدةVAT / الضريبةTotal / الإجمالي
Make / الصانعModel / الموديلTrim / الفئةYear / السنةVIN / الهيكلQuantity / الكميةUnit Price / سعر الوحدةIncluding VAT / شامل الضريبة
{{ item.make }}{{ item.model }}{{ item.year }}{{ item.vin }}{{ item.quantity|floatformat:-1 }}{{ item.selling_price }}{{ item.vat_amount }}{{ item.total }}{{ item.make }} - {{ item.model }} - {{ item.trim }}{{ item.year }}{{ item.vin }}{{ item.quantity|floatformat:-1 }}{{ item.unit_price|floatformat:2 }}{{ item.total_vat|floatformat:2 }}
{{ data.quantity|floatformat:-1 }}{{ data.total_price|floatformat:2 }}{{ data.total_vat|floatformat:2 }}
-
Additional Services \ الخدمات الإضافية
-
+ +
+ Additional Services + الخدمات الإضافية +
+ + {% if data.additionals %} +
- - - - - + + + + - {% for item in data.cars %} + {% for item in data.additionals %} - - - - - + + + {% endfor %}
Type / النوعQuantity / الكميةUnit Price / سعر الوحدةVAT / الضريبةTotal / الإجمالي
Type / النوعPrice / السعرTaxable / خاضع للضريبة
{{ item }}{{ item.quantity|floatformat:-1 }}{{ item.selling_price }}{{ item.vat_amount }}{{ item.total }}{{ item.name }}{{ item.price|floatformat:2 }}{{ item.taxable|yesno:"نعم,لا" }}
+ {% endif %}
- + - + @@ -170,11 +250,10 @@
-

Haikal | هيكل

+

Haikal | هيكل

-

Powered by TENHAL | تنحل

+

Powered by TENHAL | تنحل

- @@ -182,9 +261,9 @@ document.getElementById('download-pdf').addEventListener('click', function () { html2pdf().from(document.getElementById('invoice-content')).set({ margin: 0, - filename: "{{ invoice.invoice_number_invoice.customer.name_invoice.date_in_review }}.pdf", + filename: "{{ invoice.invoice_number }}_{{ invoice.customer.customer_name }}_{{ invoice.date_in_review|date:'Y-m-d' }}.pdf", image: { type: 'jpeg', quality: 0.98 }, - html2canvas: { scale: 2 }, + html2canvas: { scale: 3 }, jsPDF: { unit: 'mm', format: 'a4', orientation: 'portrait' } }).save(); }); diff --git a/templates/sales/payments/payment_details.html b/templates/sales/payments/payment_details.html index a3ae0ca7..191794cd 100644 --- a/templates/sales/payments/payment_details.html +++ b/templates/sales/payments/payment_details.html @@ -27,8 +27,8 @@ - - + + {% empty %}
VAT{{ data.total_vat_amount }} {{ CURRENCY }}{{ data.total_vat_amount|floatformat:2 }} {{ CURRENCY }} ضريبة القيمة المضافة
Total{{ data.grand_total }} {{ CURRENCY }}{{ data.grand_total|floatformat:2 }} {{ CURRENCY }} الإجمالي
{{ transaction.created|date}} {{ transaction.account.name }} {{ transaction.account.code }}{% if transaction.tx_type == "debit" %}${{ transaction.amount }}{% endif %}{% if transaction.tx_type == "credit" %}${{ transaction.amount }}{% endif %}{% if transaction.tx_type == "debit" %}{{ transaction.amount }}{{ CURRENCY }}{% endif %}{% if transaction.tx_type == "credit" %}{{ transaction.amount }}{{ CURRENCY }}{% endif %} {{ transaction.description }}