From: Bernd Bleßmann <bernd@kivitendo-premium.de>
Date: Wed, 23 Oct 2013 11:56:48 +0000 (+0200)
Subject: Datentypen in der Hilfe und Beispieldatei in der richtigen Reihenfolge anzeigen.
X-Git-Tag: release-3.1.0beta1~22^2~116
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=1cc72c5b3b422fcd5970b3072d0d922d89fffc13;p=kivitendo-erp.git

Datentypen in der Hilfe und Beispieldatei in der richtigen Reihenfolge anzeigen.
---

diff --git a/SL/Controller/CsvImport.pm b/SL/Controller/CsvImport.pm
index 7fa20a7e1..0ebf14164 100644
--- a/SL/Controller/CsvImport.pm
+++ b/SL/Controller/CsvImport.pm
@@ -127,12 +127,12 @@ sub action_download_sample {
   my $csv       = Text::CSV_XS->new({ binary => 1, map { ( $_ => $self->profile->get($_) ) } qw(sep_char escape_char quote_char),});
 
   if ($self->worker->is_multiplexed) {
-    foreach my $ri (keys %{ $self->displayable_columns }) {
-      $csv->print($file->fh, [ map { $_->{name}        } @{ $self->displayable_columns->{$ri} } ]);
+    foreach my $p (@{ $self->worker->profile }) {
+      $csv->print($file->fh, [ map { $_->{name}        } @{ $self->displayable_columns->{$p->{row_ident}} } ]);
       $file->fh->print("\r\n");
     }
-    foreach my $ri (keys %{ $self->displayable_columns }) {
-      $csv->print($file->fh, [ map { $_->{description} } @{ $self->displayable_columns->{$ri} } ]);
+    foreach my $p (@{ $self->worker->profile }) {
+      $csv->print($file->fh, [ map { $_->{description} } @{ $self->displayable_columns->{$p->{row_ident}} } ]);
       $file->fh->print("\r\n");
     }
   } else {
diff --git a/templates/webpages/csv_import/form.html b/templates/webpages/csv_import/form.html
index 3b46cf5f5..5b189ec77 100644
--- a/templates/webpages/csv_import/form.html
+++ b/templates/webpages/csv_import/form.html
@@ -60,12 +60,13 @@
    [%- IF SELF.worker.is_multiplexed %]
      <table>
        <tr class="listheading">
-         [%- FOREACH ri = SELF.displayable_columns.keys %]
-           <th>[%- ri %]</th>
+         [%- FOREACH p = SELF.worker.profile %]
+           <th>[%- p.row_ident %]</th>
          [%- END %]
        </tr>
        <tr class="listrow[% loop.count % 2 %]">
-         [%- FOREACH ri = SELF.displayable_columns.keys %]
+         [%- FOREACH p = SELF.worker.profile %]
+           [% SET ri = p.row_ident %]
          <td>
            <table>
              <tr class="listheading">