Bei Kreditorenbuchungsberichten in der Typ-Spalte auch Stornos gesondert ausweisen.

[kivitendo-erp.git] / bin / mozilla / datev.pl

diff --git a/bin/mozilla/datev.pl b/bin/mozilla/datev.pl
index f1110e4..6d89a21 100644 (file)
--- a/bin/mozilla/datev.pl
+++ b/bin/mozilla/datev.pl
@@ -35,11 +35,15 @@ use SL::DATEV;
 
 # 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);
@@ -80,7 +84,7 @@ 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>
@@ -111,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|">
@@ -129,6 +129,8 @@ sub export {
 sub export2 {
   $lxdebug->enter_sub();
 
+  $auth->assert('datev_export');
+
   if ($form->{exporttype} == 0) {
     &export_bewegungsdaten();
   } else {
@@ -140,6 +142,8 @@ sub export2 {
 sub export_bewegungsdaten {
   $lxdebug->enter_sub();
 
+  $auth->assert('datev_export');
+
   $form->{title} = $locale->text("DATEX - Export Assistent");
 
   $form->{allemonate} =
@@ -178,6 +182,7 @@ sub export_bewegungsdaten {
     . $locale->text('III') . qq|</option>
                          <option value=4>|
     . $locale->text('IV') . qq|</option>|;
+  $form->{"jsscript"} = 1;
   $form->header;
 
   print qq|
@@ -214,9 +219,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>
@@ -226,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}">
@@ -239,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|">
@@ -258,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;
@@ -305,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|">
@@ -324,11 +329,11 @@ sub export_stammdaten {
 sub export3 {
   $lxdebug->enter_sub();
 
+  $auth->assert('datev_export');
+
   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";
 
   if ($form->{kne}) {
     my @filenames = DATEV->kne_export(\%myconfig, \%$form);
@@ -358,6 +363,8 @@ sub export3 {
 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()));