X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Fdatev.pl;h=5f8c61e4353d6a2697fd54d340d19726cf2c2f91;hb=b3bde077a6df1550915b1433b2cabb4cf74ab681;hp=f1110e403f719cd84be0113c931be1591a46c3c6;hpb=39f3d12c0cc462f8b110966095cbc2ffef8ad8f6;p=kivitendo-erp.git
diff --git a/bin/mozilla/datev.pl b/bin/mozilla/datev.pl
index f1110e403..5f8c61e43 100644
--- 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 {
| . $locale->text("Mandantennummer") . qq| |
|
- | . $locale->text("Datenträgernummer") . qq| |
+ | . $locale->text("Medium Number") . qq| |
|
@@ -111,10 +115,6 @@ sub export {
-{path}>
-{login}>
-{password}>
-
@@ -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|
|;
+ $form->{"jsscript"} = 1;
$form->header;
print qq|
@@ -214,9 +219,11 @@ sub export_bewegungsdaten {
| |
. $locale->text('Datum von') . qq| |
- |
+
+ |
| . $locale->text('bis') . qq| |
- |
+
+ |
@@ -226,6 +233,10 @@ sub export_bewegungsdaten {
+| . $form->write_trigger(\%myconfig, 2,
+ "transdatefrom", "BL", "trigger_transdatefrom",
+ "transdateto", "BL", "trigger_transdateto") . qq|
+
@@ -239,10 +250,6 @@ sub export_bewegungsdaten {
-{path}>
-{login}>
-{password}>
-
@@ -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 {
-{path}>
-{login}>
-{password}>
-
@@ -324,30 +329,35 @@ sub export_stammdaten {
sub export3 {
$lxdebug->enter_sub();
+ $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|
| . $locale->text('KNE-Export erfolgreich!') . qq|
|);
- $link .= "&filenames=" . $form->escape(join(":", @filenames));
- print(qq|
Download|);
+ my $result = DATEV->kne_export(\%myconfig, \%$form);
+ if ($result && @{ $result->{filenames} }) {
+ $link .= Q($result->{download_token});
+
+ print(qq|
| . $locale->text('KNE-Export erfolgreich!') . qq|
Download|);
+
} else {
$form->error("KNE-Export schlug fehl.");
}
} else {
- my @filenames = DATEV->obe_export(\%myconfig, \%$form);
- if (@filenames) {
- print(qq|
| . $locale->text('OBE-Export erfolgreich!') . qq|
|);
- $link .= "&filenames=" . $form->escape(join(":", @filenames));
- print(qq|
Download|);
- } else {
- $form->error("OBE-Export schlug fehl.");
- }
+ # OBE-Export nicht implementiert.
+
+ # my @filenames = DATEV->obe_export(\%myconfig, \%$form);
+ # if (@filenames) {
+ # print(qq|
| . $locale->text('OBE-Export erfolgreich!') . qq|
|);
+ # $link .= "&filenames=" . $form->escape(join(":", @filenames));
+ # print(qq|
Download|);
+ # } else {
+ # $form->error("OBE-Export schlug fehl.");
+ # }
}
print("