From 07bd2a34fbe3270f91e5cd25ba2ca079e9af7ab2 Mon Sep 17 00:00:00 2001 From: Faheed Date: Thu, 18 Sep 2025 16:11:21 +0300 Subject: [PATCH] alignment in the pdf print and alingment of buttons in bill_card --- inventory/signals.py | 16 +++++++++++++--- templates/bill/includes/card_bill.html | 13 +++++++++++-- .../purchase_orders/po_detail_ar_pdf.html | 11 +++-------- .../purchase_orders/po_detail_en_pdf.html | 19 ++++++++----------- .../sales/estimates/estimate_preview_ar.html | 2 +- .../sales/estimates/estimate_preview_en.html | 11 +++++++---- .../sales/invoices/invoice_preview_ar.html | 2 +- .../sales/invoices/invoice_preview_en.html | 12 ++++++++---- 8 files changed, 52 insertions(+), 34 deletions(-) diff --git a/inventory/signals.py b/inventory/signals.py index e19327cf..f3af7710 100644 --- a/inventory/signals.py +++ b/inventory/signals.py @@ -1004,9 +1004,19 @@ def create_po_item_upload(sender, instance, created, **kwargs): for item in instance.get_itemtxs_data()[0]: dealer = models.Dealer.objects.get(entity=instance.entity) if item.bill_model and item.bill_model.is_paid(): - models.PoItemsUploaded.objects.get_or_create( - dealer=dealer, po=instance, item=item, status=instance.po_status - ) + models.PoItemsUploaded.objects.update_or_create( + dealer=dealer, po=instance, item=item, + defaults={ + "status":instance.po_status + } + ) + + # po_item = models.PoItemsUploaded.objects.get_or_create( + # dealer=dealer, po=instance, item=item, + # defaults={ + # "status":instance.po_status + # } + # ) # @receiver(post_save, sender=models.Staff) diff --git a/templates/bill/includes/card_bill.html b/templates/bill/includes/card_bill.html index 4873cba1..a523990b 100644 --- a/templates/bill/includes/card_bill.html +++ b/templates/bill/includes/card_bill.html @@ -50,7 +50,7 @@ {% modal_action bill 'get' entity_slug %} -
+
{% trans 'View' %} {% if perms.django_ledger.change_billmodel %} @@ -199,7 +199,7 @@ {% endif %}
-
+
{% if perms.django_ledger.change_billmodel %} {% if "update" not in request.path %} @@ -296,6 +296,15 @@ //document.addEventListener('htmx:afterSwap',processElements); function processElements() { + let bill_status = "{{bill.bill_status}}"; + if(bill_status == 'draft'){ + const formDiv = document.getElementById('bill-update-form'); + if (formDiv) { + setTimeout(()=>{ + formDiv.scrollIntoView({ behavior: 'smooth', block: 'center' }); + },500) + } + } window.showPOModal = function(title, actionUrl, buttonText) { const modalEl = document.getElementById('POModal'); if (!modalEl) { diff --git a/templates/purchase_orders/po_detail_ar_pdf.html b/templates/purchase_orders/po_detail_ar_pdf.html index a1dbdc4d..c515e612 100644 --- a/templates/purchase_orders/po_detail_ar_pdf.html +++ b/templates/purchase_orders/po_detail_ar_pdf.html @@ -104,14 +104,14 @@ font-weight: bold; } .text-right { - text-align: left; /* This is now for left alignment in an RTL context */ + text-align: right; /* This is now for left alignment in an RTL context */ } /* Footer Styles */ .document-footer { position: relative; bottom: 0; - left: 0; + left: 40px; width: 100%; text-align: center; font-size: 10px; @@ -205,12 +205,7 @@
-
-
-

ملاحظات:

-

{{ po_model.notes|default:"لا توجد ملاحظات إضافية." }}

-
-
+
diff --git a/templates/purchase_orders/po_detail_en_pdf.html b/templates/purchase_orders/po_detail_en_pdf.html index 6e6014a9..daafc202 100644 --- a/templates/purchase_orders/po_detail_en_pdf.html +++ b/templates/purchase_orders/po_detail_en_pdf.html @@ -100,11 +100,15 @@ font-weight: bold; } .text-right { - text-align: right; + text-align: left; } - /* Footer Styles */ + /* Footer Styles */ .document-footer { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; position: relative; bottom: 0; left: 0; @@ -112,17 +116,10 @@ text-align: center; font-size: 10px; color: #888; - padding-top: 15px; - margin: 0 20mm; - - } - .footer-flex { - display: flex; - justify-content: space-between; - align-items: center; - width: 100%; + margin: 0 auto; /* This change centers the footer container */ } + .footer-logo { text-align: center; } diff --git a/templates/sales/estimates/estimate_preview_ar.html b/templates/sales/estimates/estimate_preview_ar.html index d4b0cd22..a5be0e42 100644 --- a/templates/sales/estimates/estimate_preview_ar.html +++ b/templates/sales/estimates/estimate_preview_ar.html @@ -127,7 +127,7 @@ .document-footer { position: relative; bottom: 0; - left: 0; + left: 40px; width: 100%; text-align: center; font-size: 10px; diff --git a/templates/sales/estimates/estimate_preview_en.html b/templates/sales/estimates/estimate_preview_en.html index bd72ddc5..e9ddd6e8 100644 --- a/templates/sales/estimates/estimate_preview_en.html +++ b/templates/sales/estimates/estimate_preview_en.html @@ -123,8 +123,12 @@ font-weight: lighter; } - /* Footer Styles */ + /* Footer Styles */ .document-footer { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; position: relative; bottom: 0; left: 0; @@ -132,11 +136,10 @@ text-align: center; font-size: 10px; color: #888; - padding-top: 15px; - margin: 0 20mm; - + margin: 0 auto; /* This change centers the footer container */ } + .footer-flex { display: flex; justify-content: space-between; diff --git a/templates/sales/invoices/invoice_preview_ar.html b/templates/sales/invoices/invoice_preview_ar.html index de8d5299..5ac464d2 100644 --- a/templates/sales/invoices/invoice_preview_ar.html +++ b/templates/sales/invoices/invoice_preview_ar.html @@ -129,7 +129,7 @@ .document-footer { position: relative; bottom: 0; - left: 0; + left: 40px; width: 100%; text-align: center; font-size: 10px; diff --git a/templates/sales/invoices/invoice_preview_en.html b/templates/sales/invoices/invoice_preview_en.html index 80f4cc5d..7c4687eb 100644 --- a/templates/sales/invoices/invoice_preview_en.html +++ b/templates/sales/invoices/invoice_preview_en.html @@ -123,8 +123,12 @@ font-weight: lighter; } - /* Footer Styles */ + /* Footer Styles */ .document-footer { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; position: relative; bottom: 0; left: 0; @@ -132,11 +136,11 @@ text-align: center; font-size: 10px; color: #888; - padding-top: 15px; - margin: 0 20mm; - + margin: 0 auto; /* This change centers the footer container */ } + + .footer-flex { display: flex; justify-content: space-between;