#26 Annual conservation report

* enhancements for report2excel functionality
* improvements for report2html layout
+

analysis/templates/analysis/reports/includes/eco_account/amount.html

@@ -2,10 +2,6 @@
 
 <h3>{% trans 'Amount' %}</h3>
 <strong>
-    {% blocktrans %}
-    Checked = Has been checked by the registration office according to LKompVzVo
-    {% endblocktrans %}
-    <br>
     {% blocktrans %}
     Recorded = Has been checked and published by the conservation office
     {% endblocktrans %}
@@ -14,18 +10,14 @@
     <table class="table table-hover">
         <thead>
             <tr>
-                <th scope="col">{% trans 'Before' %} LKompVzVo</th>
-                <th scope="col">{% trans 'After' %} LKompVzVo</th>
-                <th scope="col">{% fa5_icon 'bookmark' %} {% trans 'Recorded' %}</th>
-                <th scope="col" class="w-25">{% trans 'Total' %}</th>
+                <th scope="col" class="w-25">{% fa5_icon 'bookmark' %} {% trans 'Recorded' %}</th>
+                <th scope="col">{% trans 'Total' %}</th>
             </tr>
         </thead>
         <tbody>
             <tr>
-                <td>{{report.eco_account_report.queryset_old_count|default_if_zero:"-"}}</td>
-                <td>{{report.eco_account_report.queryset_count|default_if_zero:"-"}}</td>
                 <td>{{report.eco_account_report.queryset_recorded_count|default_if_zero:"-"}}</td>
-                <td>{{report.eco_account_report.queryset_total_count|default_if_zero:"-"}}</td>
+                <td>{{report.eco_account_report.queryset_count|default_if_zero:"-"}}</td>
             </tr>
         </tbody>
     </table>