X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdatev.pl;h=06393376766dd599aa976a4601bc9903899d8edd;hb=ab1df08bfae3ef3361c7b5e4e16d91ae3cb34961;hp=62a1cf006bdefc084c43414ec606429ad1c7f6db;hpb=081a4f9736f3bc345872be8f61632cbed4a8d9b3;p=kivitendo-erp.git

diff --git a/bin/mozilla/datev.pl b/bin/mozilla/datev.pl
index 62a1cf006..063933767 100644
--- a/bin/mozilla/datev.pl
+++ b/bin/mozilla/datev.pl
@@ -25,13 +25,19 @@
 #
 #======================================================================
 
+use POSIX qw(strftime getcwd);
+use Archive::Zip qw(:ERROR_CODES :CONSTANTS);
+
+use SL::Common;
 use SL::DATEV;
 
 1;
 
 # end of main
 
-sub continue { &{ $form->{nextsub} } }
+require "bin/mozilla/common.pl";
+
+sub continue { call_sub($form->{"nextsub"}); }
 
 sub export {
   $lxdebug->enter_sub();
@@ -76,17 +82,18 @@ sub export {
 	  <td align=left nowrap>| . $locale->text("Mandantennummer") . qq|</td>
 	  <td><input name=mandantennr size=10 maxlength=5 value="$form->{mandantennr}"></td>
 
-	  <td align=left nowrap>| . $locale->text("Datenträgernummer") . qq|</td>
+	  <td align=left nowrap>| . $locale->text("Medium Number") . qq|</td>
 	  <td><input name=datentraegernr size=5 maxlength=3 value="$form->{datentraegernr}"></td>
 	</tr>
 	<tr>
-	  <td><input checked name=kne type=checkbox class=checkbox value=1> |
-    . $locale->text("Kontonummernerweiterung (KNE)") . qq|</td>
+	  | . # OBE-Export noch nicht implementiert! <td><input checked name=kne type=checkbox class=checkbox value=1> | . $locale->text("Kontonummernerweiterung (KNE)") . qq|</td>
+    qq|<td><input type="hidden" name="kne" value="1"></td>
           <td></td>
 
 	  <td align=left nowrap>| . $locale->text("Abrechnungsnummer") . qq|</td>
 	  <td><input name=abrechnungsnr size=5 maxlength=3 value="$form->{abrechnungsnr}"></td>
 	</tr>
+
         <tr>
           <td><input name=exporttype type=radio class=radio value=0 checked> |
     . $locale->text("Export Buchungsdaten") . qq|</td>
@@ -106,7 +113,6 @@ sub export {
 
 <input type=hidden name=nextsub value=export2>
 
-<input type=hidden name=path value=$form->{path}>
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 
@@ -173,6 +179,7 @@ sub export_bewegungsdaten {
     . $locale->text('III') . qq|</option>
                          <option value=4>|
     . $locale->text('IV') . qq|</option>|;
+  $form->{"jsscript"} = 1;
   $form->header;
 
   print qq|
@@ -209,9 +216,11 @@ sub export_bewegungsdaten {
         <tr>
           <td align=left><input name=zeitraum class=radio type=radio value=zeit>&nbsp;</td><td align=left>|
     . $locale->text('Datum von') . qq|</td>
-          <td align=left><input name=transdatefrom size=8></td>
+          <td align=left><input id=transdatefrom name=transdatefrom size=10>
+            <input type="button" name="transdatefrom" id="trigger_transdatefrom" value="?"></td>
 	  <td align=left>| . $locale->text('bis') . qq|</td>
-          <td align=left><input name=transdateto size=8></td>
+          <td align=left><input id=transdateto name=transdateto size=10>
+            <input type="button" name="transdateto" id="trigger_transdateto" value="?"></td>
 	</tr>
       </table>
     </td>
@@ -221,6 +230,10 @@ sub export_bewegungsdaten {
   </tr>
 </table>
 
+| . $form->write_trigger(\%myconfig, 2,
+                         "transdatefrom", "BL", "trigger_transdatefrom",
+                         "transdateto", "BL", "trigger_transdateto") . qq|
+
 <input type=hidden name=beraternr value="$form->{beraternr}">
 <input type=hidden name=dfvkz value="$form->{dfvkz}">
 <input type=hidden name=beratername value="$form->{beratername}">
@@ -234,7 +247,6 @@ sub export_bewegungsdaten {
 
 <input type=hidden name=nextsub value=export3>
 
-<input type=hidden name=path value=$form->{path}>
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 
@@ -300,7 +312,6 @@ sub export_stammdaten {
 
 <input type=hidden name=nextsub value=export3>
 
-<input type=hidden name=path value=$form->{path}>
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 
@@ -321,14 +332,65 @@ sub export3 {
 
   DATEV->save_datev_stamm(\%myconfig, \%$form);
 
+  my $link = $form->{"script"} . "?";
+  map({ $link .= "${_}=" . $form->escape($form->{$_}) . "&"; } qw(login password));
+  $link .= "action=download";
+
   if ($form->{kne}) {
-    if (DATEV->kne_export(\%myconfig, \%$form)) {
-      $form->redirect($locale->text('KNE Export erfolgreich!'));
+    my @filenames = DATEV->kne_export(\%myconfig, \%$form);
+    if (@filenames) {
+      print(qq|<br><b>| . $locale->text('KNE-Export erfolgreich!') . qq|</b><br>|);
+      $link .= "&filenames=" . $form->escape(join(":", @filenames));
+      print(qq|<br><a href="$link">Download</a>|);
+    } else {
+      $form->error("KNE-Export schlug fehl.");
     }
   } else {
-    if (DATEV->obe_export(\%myconfig, \%$form)) {
-      $form->redirect($locale->text('OBE Export erfolgreich!'));
+    my @filenames = DATEV->obe_export(\%myconfig, \%$form);
+    if (@filenames) {
+      print(qq|<br><b>| . $locale->text('OBE-Export erfolgreich!') . qq|</b><br>|);
+      $link .= "&filenames=" . $form->escape(join(":", @filenames));
+      print(qq|<br><a href="$link">Download</a>|);
+    } else {
+      $form->error("OBE-Export schlug fehl.");
     }
   }
+
+  print("</body></html>");
+
+  $lxdebug->leave_sub();
+}
+
+sub download {
+  $lxdebug->enter_sub();
+
+  my $tmp_name = Common->tmpname();
+  my $zip_name = strftime("lx-office-datev-export-%Y%m%d.zip",
+                          localtime(time()));
+
+  my $cwd = getcwd();
+  chdir("users") || die("chdir users");
+
+  my @filenames = split(/:/, $form->{"filenames"});
+  map({ s|.*/||; $form->error("Eine der KNE-Exportdateien wurde nicht " .
+                              "gefunden. Wurde der Export bereits " .
+                              "durchgef&uuml;hrt?") unless (-f $_); }
+      @filenames);
+
+  my $zip = Archive::Zip->new();
+  map({ $zip->addFile($_); } @filenames);
+  $zip->writeToFileNamed($tmp_name);
+  chdir($cwd);
+
+  open(IN, $tmp_name) || die("open $tmp_name");
+  print("Content-Type: application/zip\n");
+  print("Content-Disposition: attachment; filename=\"${zip_name}\"\n\n");
+  while (<IN>) {
+    print($_);
+  }
+  close(IN);
+
+  unlink($tmp_name);
+
   $lxdebug->leave_sub();
 }