X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdatev.pl;h=4ada35f109624f47a852aec4d615a04fac42daad;hb=0e079eba45bcb834792660358b2e86dcb70e494e;hp=9944abfba13e699fe72a2e19c69aaf32c5402082;hpb=a14a3ff56b00e22c39a2cfb0e465f8c7764a4cd4;p=kivitendo-erp.git

diff --git a/bin/mozilla/datev.pl b/bin/mozilla/datev.pl
index 9944abfba..4ada35f10 100644
--- a/bin/mozilla/datev.pl
+++ b/bin/mozilla/datev.pl
@@ -31,14 +31,24 @@ use Archive::Zip qw(:ERROR_CODES :CONSTANTS);
 use SL::Common;
 use SL::DATEV;
 
+use strict;
+
 1;
 
 # end of main
 
-sub continue { &{ $form->{nextsub} } }
+require "bin/mozilla/common.pl";
+
+sub continue { call_sub($main::form->{"nextsub"}); }
 
 sub export {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('datev_export');
 
   $form->{title} = $locale->text("DATEX - Export Assistent");
 
@@ -62,45 +72,45 @@ sub export {
   <tr valign=top>
     <td>
       <table>
-	<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><input name=datentraegernr size=5 maxlength=3 value="$form->{datentraegernr}"></td>
-	</tr>
-	<tr>
-	  | . # OBE-Export noch nicht implementiert! <td><input checked name=kne type=checkbox class=checkbox value=1> | . $locale->text("Kontonummernerweiterung (KNE)") . qq|</td>
+        <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("Medium Number") . qq|</td>
+          <td><input name=datentraegernr size=5 maxlength=3 value="$form->{datentraegernr}"></td>
+        </tr>
+        <tr>
+          | . # 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>
+          <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>
           <td></td>
 
-	  <td><input name=exporttype type=radio class=radio value=1> |
+          <td><input name=exporttype type=radio class=radio value=1> |
     . $locale->text("Export Stammdaten") . qq|</td>
           <td></td>
-	</td>
+        </td>
       </table>
     </td>
   </tr>
@@ -111,10 +121,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|">
@@ -123,22 +129,32 @@ sub export {
 </body>
 </html>
 |;
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub export2 {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+
+  $main::auth->assert('datev_export');
 
   if ($form->{exporttype} == 0) {
     &export_bewegungsdaten();
   } else {
     &export_stammdaten();
   }
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub export_bewegungsdaten {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('datev_export');
 
   $form->{title} = $locale->text("DATEX - Export Assistent");
 
@@ -198,17 +214,17 @@ sub export_bewegungsdaten {
   <tr valign=top>
     <td>
       <table>
-	<tr>
+        <tr>
           <td align=left><input checked name=zeitraum class=radio type=radio value=monat>&nbsp;</td><td align=left>|
     . $locale->text('Monat') . qq|</td>
           <td align=left></td>
-	  <td align=left></td>
+          <td align=left></td>
           <td align=left><select name=monat>$form->{allemonate}</select></td>
         </tr>
         <tr>
           <td align=left><input name=zeitraum class=radio type=radio value=quartal>&nbsp;</td><td align=left>|
     . $locale->text('Quartal') . qq|</td>
-	  <td align=left></td>
+          <td align=left></td>
           <td align=left></td>
           <td align=left><select name=quartal>$form->{allequartale}</select></td>
         </tr>
@@ -217,10 +233,10 @@ sub export_bewegungsdaten {
     . $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>| . $locale->text('bis') . qq|</td>
           <td align=left><input id=transdateto name=transdateto size=10>
             <input type="button" name="transdateto" id="trigger_transdateto" value="?"></td>
-	</tr>
+        </tr>
       </table>
     </td>
   </tr>
@@ -246,10 +262,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|">
@@ -259,11 +271,16 @@ sub export_bewegungsdaten {
 </html>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub export_stammdaten {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('datev_export');
 
   $form->{title} = $locale->text("DATEX - Export Assistent");
 
@@ -285,11 +302,11 @@ sub export_stammdaten {
     <td>
       <table>
         <tr>
-	  <td align=left>| . $locale->text('Von Konto: ') . qq|</td>
+          <td align=left>| . $locale->text('Von Konto: ') . qq|</td>
           <td align=left><input name=accnofrom size=8 maxlength=8></td>
         </tr>
         <tr>
-	  <td align=left>| . $locale->text('Bis Konto: ') . qq|</td>
+          <td align=left>| . $locale->text('Bis Konto: ') . qq|</td>
           <td align=left><input name=accnoto size=8 maxlength=8></td>
         </tr>
       </table>
@@ -312,10 +329,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|">
@@ -325,62 +338,86 @@ sub export_stammdaten {
 </html>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub export3 {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('datev_export');
+
+  DATEV::clean_temporary_directories();
 
   DATEV->save_datev_stamm(\%myconfig, \%$form);
 
-  my $link = $form->{"script"} . "?";
-  map({ $link .= "${_}=" . $form->escape($form->{$_}) . "&"; } qw(path login password));
-  $link .= "action=download";
+  my $link = "datev.pl?action=download&download_token=";
 
   if ($form->{kne}) {
-    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>|);
+    my $result = DATEV->kne_export(\%myconfig, \%$form);
+    if ($result && @{ $result->{filenames} }) {
+      $link .= Q($result->{download_token});
+
+      print(qq|<br><b>| . $locale->text('KNE-Export erfolgreich!') . qq|</b><br><br><a href="$link">Download</a>|);
+
+      print $form->parse_html_template('datev/net_gross_difference') if @{ $form->{net_gross_differences} };
+
     } else {
       $form->error("KNE-Export schlug fehl.");
     }
   } else {
-    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.");
-    }
+    # OBE-Export nicht implementiert.
+
+    # 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();
+  $main::lxdebug->leave_sub();
 }
 
 sub download {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('datev_export');
 
   my $tmp_name = Common->tmpname();
-  my $zip_name = strftime("lx-office-datev-export-%Y%m%d.zip",
-                          localtime(time()));
+  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 $path = DATEV::get_path_for_download_token($form->{download_token});
+  if (!$path) {
+    $form->error($locale->text("Your download does not exist anymore. Please re-run the DATEV export assistant."));
+  }
+
+  chdir($path) || die("chdir $path");
+
+  my @filenames = glob "*";
+
+  if (!@filenames) {
+    chdir($cwd);
+    DATEV::clean_temporary_directories();
+    $form->error($locale->text("Your download does not exist anymore. Please re-run the DATEV export assistant."));
+  }
 
   my $zip = Archive::Zip->new();
-  map({ $zip->addFile($_); } @filenames);
+  map { $zip->addFile($_); } @filenames;
   $zip->writeToFileNamed($tmp_name);
+
   chdir($cwd);
 
   open(IN, $tmp_name) || die("open $tmp_name");
@@ -393,5 +430,7 @@ sub download {
 
   unlink($tmp_name);
 
-  $lxdebug->leave_sub();
+  DATEV::clean_temporary_directories();
+
+  $main::lxdebug->leave_sub();
 }