From 5b5fc3ca94e10e9e29591e31358e66ea8f8db14e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20B=C3=BCren?= <jan@kivitendo-premium.de>
Date: Tue, 7 Nov 2017 10:29:01 +0100
Subject: [PATCH] =?utf8?q?DATEV=20CSV-Export=20an=20der=20Oberfl=C3=A4che?=
 =?utf8?q?=20als=20neue=20Option=20anzeigen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 bin/mozilla/datev.pl                                |  2 +-
 templates/webpages/datev/export.html                | 11 +++++++++--
 templates/webpages/datev/export3.html               |  4 ++--
 templates/webpages/datev/export_bewegungsdaten.html |  3 +--
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/bin/mozilla/datev.pl b/bin/mozilla/datev.pl
index 28043e174..8d18281ee 100644
--- a/bin/mozilla/datev.pl
+++ b/bin/mozilla/datev.pl
@@ -106,7 +106,7 @@ sub export3 {
 
   my %data = (
     exporttype => $::form->{exporttype} ? DATEV_ET_STAMM : DATEV_ET_BUCHUNGEN,
-    format     => $::form->{kne}        ? DATEV_FORMAT_KNE : $::form->{csv} ? DATEV_FORMAT_CSV : die "unknown format",
+    format     => $::form->{exportformat} eq 'kne' ? DATEV_FORMAT_KNE :  DATEV_FORMAT_CSV,
   );
 
   if ($::form->{exporttype} == DATEV_ET_STAMM) {
diff --git a/templates/webpages/datev/export.html b/templates/webpages/datev/export.html
index 588309a32..67ad11677 100644
--- a/templates/webpages/datev/export.html
+++ b/templates/webpages/datev/export.html
@@ -33,7 +33,7 @@
           <td><input name=datentraegernr size=5 maxlength=3 value="[% datentraegernr %]"></td>
         </tr>
         <tr>
-          <td><input type="hidden" name="kne" value="1"></td>
+          <td></td>
           <td></td>
 
           <td align=left nowrap>[% 'Abrechnungsnummer' | $T8 %]</td>
@@ -46,7 +46,14 @@
 
           <td><input name=exporttype type=radio class=radio value=1> [% 'Export Stammdaten' | $T8 %]</td>
           <td></td>
-        </td>
+        </tr>
+        <tr>
+          <td><input name=exportformat type=radio class=radio value=csv checked> [% 'CSV' | $T8 %]</td>
+          <td></td>
+
+          <td><input name=exportformat type=radio class=radio value=kne> [% 'KNE' | $T8 %]</td>
+          <td></td>
+        </tr>
       </table>
     </td>
   </tr>
diff --git a/templates/webpages/datev/export3.html b/templates/webpages/datev/export3.html
index 0e5fb116c..dd10c75a5 100644
--- a/templates/webpages/datev/export3.html
+++ b/templates/webpages/datev/export3.html
@@ -7,10 +7,10 @@
   <br>
 
   <br><b>
-[% IF kne %]
+[% IF exportformat == 'kne' %]
   [% 'KNE Export successful!' | $T8 %]
 [% END %]
-[% IF csv %]
+[% IF exportformat == 'csv' %]
   [% 'CSV Export successful!' | $T8 %]
 [% END %]
 
diff --git a/templates/webpages/datev/export_bewegungsdaten.html b/templates/webpages/datev/export_bewegungsdaten.html
index a472402de..be85405d8 100644
--- a/templates/webpages/datev/export_bewegungsdaten.html
+++ b/templates/webpages/datev/export_bewegungsdaten.html
@@ -117,8 +117,7 @@
 <input type=hidden name=passwort value="[% passwort %]">
 <input type=hidden name=mandantennr value="[% mandantennr %]">
 <input type=hidden name=datentraegernr value="[% datentraegernr %]">
-<input type=hidden name=kne value="[% kne %]">
-<input type=hidden name=csv value="[% csv %]">
+<input type=hidden name=exportformat value="[% exportformat %]">
 <input type=hidden name=abrechnungsnr value="[% abrechnungsnr %]">
 
 <input type=hidden name=exporttype value="[% exporttype %]">
-- 
2.20.1