Skip to content

Commit ae0fb98

Browse files
committed
Fixes
1 parent 8688b61 commit ae0fb98

3 files changed

Lines changed: 12 additions & 7 deletions

File tree

landolfio/inventory_frontend/templates/detail.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ <h5>{% translate "No active agreements" %}</h5>
457457
<div class="tab-pane fade purchase-price" id="history">
458458
<div class="row">
459459
<div class="col-12">
460-
{% if asset.journal_document_lines.exists %}
460+
{% if journal_history %}
461461
<div class="table-responsive">
462462
<table class="table table-hover">
463463
<thead>
@@ -469,7 +469,7 @@ <h5>{% translate "No active agreements" %}</h5>
469469
</tr>
470470
</thead>
471471
<tbody>
472-
{% for line in asset.journal_document_line_assets.all %}
472+
{% for line in journal_history %}
473473
<tr>
474474
<td>{{ line.document_line.document.date|date:"d-m-Y" }}</td>
475475
<td>{{ line.document_line.description }}</td>

landolfio/inventory_frontend/views.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
from django.contrib import messages
22
from django.shortcuts import redirect
3-
from django.views.generic import ListView, DetailView, CreateView, UpdateView
4-
from django.contrib.auth.mixins import LoginRequiredMixin
3+
from django.views.generic import ListView, DetailView, CreateView
54
from django.db.models import Q
65
from django.http import JsonResponse
7-
from django.urls import reverse_lazy
86
from django_drf_filepond.api import store_upload
97
from django_drf_filepond.models import TemporaryUpload
108
from django.views import View
119

1210
from inventory.models.asset import Asset, AssetStates
11+
from inventory.models.asset_on_document_line import AssetOnJournalDocumentLine
1312
from inventory.models.attachment import Attachment, attachments_directory_path
1413
from inventory.models.category import Category
1514
from inventory.models.collection import Collection
@@ -252,6 +251,12 @@ def get_context_data(self, **kwargs):
252251
]
253252
context["locations"] = Location.objects.all().order_by("order", "name")
254253

254+
context["journal_history"] = (
255+
AssetOnJournalDocumentLine.objects.filter(asset=asset)
256+
.select_related("document_line__document", "document_line__ledger_account")
257+
.order_by("-document_line__document__date")
258+
)
259+
255260
return context
256261

257262
def post(self, request, *args, **kwargs):

landolfio/ninox_import/ninox_sync.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,9 @@ def get(self, url, stream=False):
194194
response.raise_for_status()
195195
self._logger.info(f"Got response: {response}")
196196
except HTTPError as http_err:
197-
print(f"HTTP error occurred: {http_err}")
197+
self._logger.error(f"HTTP error occurred: {http_err}")
198198
except Exception as err:
199-
print(f"Other error occurred: {err}")
199+
self._logger.error(f"Other error occurred: {err}")
200200
else:
201201
if stream:
202202
return response

0 commit comments

Comments
 (0)