X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdatev.pl;h=6d89a21b911823c3ee1b751ee9833f060297cfb8;hb=09685616f65f95b3189049855dfc53d2bf1ef271;hp=654a0e2f948ff75e0a7a4bb5ad137bdc1e0a8b55;hpb=d319704a66e9be64da837ccea10af6774c2b0838;p=kivitendo-erp.git

diff --git a/bin/mozilla/datev.pl b/bin/mozilla/datev.pl
index 654a0e2f9..6d89a21b9 100644
--- a/bin/mozilla/datev.pl
+++ b/bin/mozilla/datev.pl
@@ -25,17 +25,25 @@
 #
 #======================================================================
 
+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();
 
+  $auth->assert('datev_export');
+
   $form->{title} = $locale->text("DATEX - Export Assistent");
 
   DATEV->get_datev_stamm(\%myconfig, \%$form);
@@ -61,42 +69,40 @@ sub export {
 	<tr>
 	  <td align=left nowrap>| . $locale->text("Beraternummer") . qq|</td>
 	  <td><input name=beraternr size=10 maxlength=7 value="$form->{beraternr}"></td>
-	
+
 	  <td align=left nowrap>| . $locale->text("DFV-Kennzeichen") . qq|</td>
 	  <td><input name=dfvkz size=5 maxlength=2 value="$form->{dfvkz}"></td>
 	</tr>
 	<tr>
 	  <td align=left nowrap>| . $locale->text("Beratername") . qq|</td>
 	  <td><input name=beratername size=10 maxlength=9 value="$form->{beratername}"></td>
-	
+
 	  <td align=left nowrap>| . $locale->text("Password") . qq|</td>
 	  <td><input name=passwort size=5 maxlength=4 value="$form->{passwort}"></td>
 	</tr>
 	<tr>
 	  <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>
 	<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>
+    . $locale->text("Export Buchungsdaten") . qq|</td>
           <td></td>
-          
+
 	  <td><input name=exporttype type=radio class=radio value=1> |
-    . $locale->text("Export Stammdaten")
-    . qq|</td>
+    . $locale->text("Export Stammdaten") . qq|</td>
           <td></td>
 	</td>
       </table>
@@ -109,10 +115,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}>
-
 <br>
 <input type=submit class=submit name=action value="|
     . $locale->text('Continue') . qq|">
@@ -127,6 +129,8 @@ sub export {
 sub export2 {
   $lxdebug->enter_sub();
 
+  $auth->assert('datev_export');
+
   if ($form->{exporttype} == 0) {
     &export_bewegungsdaten();
   } else {
@@ -138,6 +142,8 @@ sub export2 {
 sub export_bewegungsdaten {
   $lxdebug->enter_sub();
 
+  $auth->assert('datev_export');
+
   $form->{title} = $locale->text("DATEX - Export Assistent");
 
   $form->{allemonate} =
@@ -145,38 +151,27 @@ sub export_bewegungsdaten {
     . $locale->text('January')
     . qq|</option>
                          <option value=2>|
-    . $locale->text('February')
-    . qq|</option>
+    . $locale->text('February') . qq|</option>
                          <option value=3>|
-    . $locale->text('March')
-    . qq|</option>
+    . $locale->text('March') . qq|</option>
                          <option value=4>|
-    . $locale->text('April')
-    . qq|</option>
+    . $locale->text('April') . qq|</option>
                          <option value=5>|
-    . $locale->text('May')
-    . qq|</option>
+    . $locale->text('May') . qq|</option>
                          <option value=6>|
-    . $locale->text('June')
-    . qq|</option>
+    . $locale->text('June') . qq|</option>
                          <option value=7>|
-    . $locale->text('July')
-    . qq|</option>
+    . $locale->text('July') . qq|</option>
                          <option value=8>|
-    . $locale->text('August')
-    . qq|</option>
+    . $locale->text('August') . qq|</option>
                          <option value=9>|
-    . $locale->text('September')
-    . qq|</option>
+    . $locale->text('September') . qq|</option>
                          <option value=10>|
-    . $locale->text('October')
-    . qq|</option>
+    . $locale->text('October') . qq|</option>
                          <option value=11>|
-    . $locale->text('November')
-    . qq|</option>
+    . $locale->text('November') . qq|</option>
                          <option value=12>|
-    . $locale->text('December')
-    . qq|</option>|;
+    . $locale->text('December') . qq|</option>|;
 
   $form->{allequartale} =
       qq|<option selected value=1>|
@@ -184,11 +179,10 @@ sub export_bewegungsdaten {
     . qq|</option>
                          <option value=2>| . $locale->text('II') . qq|</option>
                          <option value=3>|
-    . $locale->text('III')
-    . qq|</option>
+    . $locale->text('III') . qq|</option>
                          <option value=4>|
-    . $locale->text('IV')
-    . qq|</option>|;
+    . $locale->text('IV') . qq|</option>|;
+  $form->{"jsscript"} = 1;
   $form->header;
 
   print qq|
@@ -210,27 +204,26 @@ sub export_bewegungsdaten {
       <table>
 	<tr>
           <td align=left><input checked name=zeitraum class=radio type=radio value=monat>&nbsp;</td><td align=left>|
-    . $locale->text('Monat')
-    . qq|</td>
+    . $locale->text('Monat') . qq|</td>
           <td align=left></td>
 	  <td align=left></td>
           <td align=left><select name=monat>$form->{allemonate}</select></td>
         </tr>
-        <tr>  
+        <tr>
           <td align=left><input name=zeitraum class=radio type=radio value=quartal>&nbsp;</td><td align=left>|
-    . $locale->text('Quartal')
-    . qq|</td>
+    . $locale->text('Quartal') . qq|</td>
 	  <td align=left></td>
           <td align=left></td>
           <td align=left><select name=quartal>$form->{allequartale}</select></td>
         </tr>
-        <tr> 
+        <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>
+    . $locale->text('Datum von') . qq|</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>
@@ -240,6 +233,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}">
@@ -253,10 +250,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}>
-
 <br>
 <input type=submit class=submit name=action value="|
     . $locale->text('Continue') . qq|">
@@ -272,6 +265,8 @@ sub export_bewegungsdaten {
 sub export_stammdaten {
   $lxdebug->enter_sub();
 
+  $auth->assert('datev_export');
+
   $form->{title} = $locale->text("DATEX - Export Assistent");
 
   $form->header;
@@ -319,10 +314,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}>
-
 <br>
 <input type=submit class=submit name=action value="|
     . $locale->text('Continue') . qq|">
@@ -338,16 +329,69 @@ sub export_stammdaten {
 sub export3 {
   $lxdebug->enter_sub();
 
+  $auth->assert('datev_export');
+
   DATEV->save_datev_stamm(\%myconfig, \%$form);
 
+  my $link = "datev.pl?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();
+
+  $auth->assert('datev_export');
+
+  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();
 }