IT-Naturschutz/konova
7
0
Fork 0
Code Issues 7 Pull Requests Actions Projects Releases 47 Wiki Activity

Merge branch 'master' into 138_New_map_client

Browse Source 
# Conflicts:
#	konova/models/geometry.py
#	konova/urls.py
#	locale/de/LC_MESSAGES/django.mo
#	locale/de/LC_MESSAGES/django.po
This commit is contained in:
mpeltriaux
2022-05-25 09:22:15 +02:00
parent 714d888326 1f998ebf76
commit c0595760ab
32 changed files with 483 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compensation/templates/compensation/detail/compensation/view.html
View File

@@ -124,7 +124,7 @@
</div>
</div>
<div class="row">
{% include 'konova/includes/parcels.html' %}
{% include 'konova/includes/parcels/parcels.html' %}
</div>
<div class="row">
{% include 'konova/includes/comment_card.html' %}

2
compensation/templates/compensation/detail/eco_account/view.html
View File

@@ -106,7 +106,7 @@
</div>
</div>
<div class="row">
{% include 'konova/includes/parcels.html' %}
{% include 'konova/includes/parcels/parcels.html' %}
</div>
<div class="row">
{% include 'konova/includes/comment_card.html' %}

2
compensation/templates/compensation/report/compensation/report.html
View File

@@ -40,7 +40,7 @@
</div>
</div>
<div class="row">
{% include 'konova/includes/parcels.html' %}
{% include 'konova/includes/parcels/parcels.html' %}
</div>
<div class="row">
{% include 'konova/includes/report/qrcodes.html' %}

2
compensation/templates/compensation/report/eco_account/report.html
View File

@@ -53,7 +53,7 @@
</div>
</div>
<div class="row">
{% include 'konova/includes/parcels.html' %}
{% include 'konova/includes/parcels/parcels.html' %}
</div>
<div class="row">
{% include 'konova/includes/report/qrcodes.html' %}