X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fcsv_import%2Freport.html;h=539ce5a1f0e9a5a6ad3b16da4eb71f365fcc9a07;hb=48da03126f83ad6f3406b8c70a077ab52e18823d;hp=96fb0a547acc5337881c62a1cae9542ffd6a02f9;hpb=638e0b031a49d9864395e8600077306b91a45252;p=kivitendo-erp.git

diff --git a/templates/webpages/csv_import/report.html b/templates/webpages/csv_import/report.html
index 96fb0a547..539ce5a1f 100644
--- a/templates/webpages/csv_import/report.html
+++ b/templates/webpages/csv_import/report.html
@@ -1,12 +1,12 @@
 [% USE HTML %]
 [% USE LxERP %]
 [% USE L %]
-
  <h3>[%- LxERP.t8('Import result') %]</h3>
 
+[%- PROCESS 'common/paginate.html' pages=SELF.pages, base_url = SELF.base_url %]
  <table>
 [%- FOREACH rownum = SELF.display_rows %]
- [%- IF loop.first %]
+ [%- IF rownum < SELF.report_numheaders %]
   <tr class="listheading">
   [%- FOREACH value = SELF.report_rows.${rownum} %]
    <th>[% value | html %]</th>
@@ -15,13 +15,13 @@
   </tr>
  [%- ELSE %]
   [% csv_import_report_errors = SELF.report_status.${rownum}.errors %]
-  <tr class="[% IF csv_import_report_errors.size %]redrow[% ELSE %]listrow[% END %][% 1 - loop.count % 2 %]">
+  <tr class="[% IF csv_import_report_errors && csv_import_report_errors.size %]redrow[% ELSE %]listrow[% END %][% 1 - loop.count % 2 %]">
   [%- FOREACH value = SELF.report_rows.${rownum} %]
    <td>[%- value | html  %]</td>
   [%- END %]
    <td>
     [%- FOREACH error = csv_import_report_errors %][%- error | html %][% UNLESS loop.last %]<br>[%- END %][%- END %]
-    [%- FOREACH info  = SELF.report_status.${rownum}.information %][% IF !loop.first || csv_import_report_errors.size %]<br>[%- END %][%- info | html %][%- END %]
+    [%- FOREACH info  = SELF.report_status.${rownum}.information %][% IF rownum >= SELF.report_numheaders || csv_import_report_errors.size %]<br>[%- END %][%- info | html %][%- END %]
    </td>
   </tr>
  [%- END %]
@@ -29,7 +29,7 @@
 
  </table>
 
-[%- PROCESS 'common/paginate.html' pages=SELF.pages %]
+[%- PROCESS 'common/paginate.html' pages=SELF.pages, base_url = SELF.base_url %]
 
 <script type='text/javascript'>
   $(function(){ $('#action_import').show() });