More fixes

Author: JobDoesburg

entrypoint.sh

@@ -1,3 +1,20 @@
 #!/bin/sh
 python manage.py migrate --noinput
-uwsgi --http :80 --wsgi-file /app/website/wsgi.py --master --processes 4 --threads 2 --uid nobody --gid nogroup --static-map ${DJANGO_STATIC_URL}=${DJANGO_STATIC_ROOT} --static-map ${DJANGO_MEDIA_URL}=${DJANGO_MEDIA_ROOT} --logto /var/log/uwsgi.log
+
+# Start tail for uWSGI logs in background (send to stdout for docker logs)
+tail -F /var/log/uwsgi.log &
+
+# Start uWSGI (logs go to both file and stdout)
+uwsgi --http :80 \
+      --wsgi-file /app/website/wsgi.py \
+      --master \
+      --processes 4 \
+      --threads 2 \
+      --uid nobody \
+      --gid nogroup \
+      --static-map ${DJANGO_STATIC_URL}=${DJANGO_STATIC_ROOT} \
+      --static-map ${DJANGO_MEDIA_URL}=${DJANGO_MEDIA_ROOT} \
+      --logto /var/log/uwsgi.log \
+      --log-date \
+      --log-4xx \
+      --log-5xx

landolfio/inventory/models/asset.py

@@ -662,14 +662,14 @@ def accounting_status_compatible_with_local_status(self):
     @property
     def last_accounting_description(self):
         latest_asset_agreement = self.estimate_document_lines.latest(
-            "document__created_at"
+            "document__estimate_date"
         )
         return latest_asset_agreement.description
 
     @property
     def last_accounting_price(self):
         latest_asset_agreement = self.estimate_document_lines.latest(
-            "document__created_at"
+            "document__estimate_date"
         )
         return latest_asset_agreement.price
 

landolfio/inventory_frontend/templates/detail.html

@@ -400,7 +400,7 @@ <h5 class="mb-3">{% translate "Rental Agreements" %}</h5>
                                         {% for line in asset.estimate_document_lines.all %}
                                             {% if line.document.workflow.is_rental %}
                                                 <tr>
-                                                    <td>{{ line.document.created_at|date:"d-m-Y" }}</td>
+                                                    <td>{{ line.document.estimate_date|date:"d-m-Y" }}</td>
                                                     <td>{{ line.description }}</td>
                                                     <td>€{{ line.price|floatformat:2 }}</td>
                                                     <td>
@@ -430,7 +430,7 @@ <h5 class="mb-3">{% translate "Loan Agreements" %}</h5>
                                         {% for line in asset.estimate_document_lines.all %}
                                             {% if line.document.workflow.is_loan %}
                                                 <tr>
-                                                    <td>{{ line.document.created_at|date:"d-m-Y" }}</td>
+                                                    <td>{{ line.document.estimate_date|date:"d-m-Y" }}</td>
                                                     <td>{{ line.description }}</td>
                                                     <td>€{{ line.price|floatformat:2 }}</td>
                                                     <td>
@@ -471,7 +471,7 @@ <h5>{% translate "No active agreements" %}</h5>
                                 <tbody>
                                     {% for line in journal_history %}
                                         <tr>
-                                            <td>{{ line.document_line.document.date|date:"d-m-Y" }}</td>
+                                            <td>{{ line.document_line.date|date:"d-m-Y" }}</td>
                                             <td>{{ line.document_line.description }}</td>
                                             <td>{{ line.document_line.ledger_account.name }}</td>
                                             <td class="text-end">€{{ line.value|floatformat:2 }}</td>

landolfio/inventory_frontend/views.py

@@ -254,7 +254,7 @@ def get_context_data(self, **kwargs):
         context["journal_history"] = (
             AssetOnJournalDocumentLine.objects.filter(asset=asset)
             .select_related("document_line__ledger_account")
-            .order_by("-document_line__created_at")
+            .order_by("-document_line__document__date")
         )
 
         return context