X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/d629acd82a27e980899a044ca8b0f4becc8e94bb..4c4939d0:/bin/mozilla/datev.pl diff --git a/bin/mozilla/datev.pl b/bin/mozilla/datev.pl index a98a9529f..8915d2f8b 100644 --- a/bin/mozilla/datev.pl +++ b/bin/mozilla/datev.pl @@ -31,366 +31,151 @@ use Archive::Zip qw(:ERROR_CODES :CONSTANTS); use SL::Common; use SL::DATEV; +use strict; + 1; # end of main require "bin/mozilla/common.pl"; -sub continue { call_sub($form->{"nextsub"}); } +sub continue { call_sub($main::form->{"nextsub"}); } sub export { - $lxdebug->enter_sub(); - - $form->{title} = $locale->text("DATEX - Export Assistent"); - - DATEV->get_datev_stamm(\%myconfig, \%$form); - $form->header; - - print qq| - - -

{script}> - - - - - - - - - - - - - - - - -

$form->{title}

| . $locale->text("DATEV Angaben") . qq|

- - - - - - - - - - - - - - - - - - - - - - - - | . # OBE-Export noch nicht implementiert! - qq| - - - - - - - - - - - - - -

\| . $locale->text("Beraternummer") . qq\|	\| . $locale->text("DFV-Kennzeichen") . qq\|
\| . $locale->text("Beratername") . qq\|	\| . $locale->text("Password") . qq\|
\| . $locale->text("Mandantennummer") . qq\|	\| . $locale->text("Datenträgernummer") . qq\|
\| . $locale->text("Kontonummernerweiterung (KNE)") . qq\|		\| . $locale->text("Abrechnungsnummer") . qq\|
\| - . $locale->text("Export Buchungsdaten") . qq\|	\| - . $locale->text("Export Stammdaten") . qq\|

- - - -{login}> -{password}> - -
- -

- - - -|; - $lxdebug->leave_sub(); + $::lxdebug->enter_sub; + $::auth->assert('datev_export'); + + DATEV->get_datev_stamm(\%::myconfig, $::form); + $::form->header; + print $::form->parse_html_template('datev/export'); + + $::lxdebug->leave_sub; } sub export2 { - $lxdebug->enter_sub(); + $::lxdebug->enter_sub; + $::auth->assert('datev_export'); - if ($form->{exporttype} == 0) { - &export_bewegungsdaten(); + if ($::form->{exporttype} == 0) { + export_bewegungsdaten(); } else { - &export_stammdaten(); + export_stammdaten(); } - $lxdebug->leave_sub(); + $::lxdebug->leave_sub; } sub export_bewegungsdaten { - $lxdebug->enter_sub(); - - $form->{title} = $locale->text("DATEX - Export Assistent"); - - $form->{allemonate} = - qq| - - - - - - - - - - - |; - - $form->{allequartale} = - qq| - - - |; - $form->{"jsscript"} = 1; - $form->header; - - print qq| - - -

{script}> - - - - - - - - - - - - - - - - -

$form->{title}

| . $locale->text("Zeitraum") . qq|

- - - - - - - - - - - - - - - - - - - -

\| - . $locale->text('Monat') . qq\|
\| - . $locale->text('Quartal') . qq\|
\| - . $locale->text('Datum von') . qq\|	-	\| . $locale->text('bis') . qq\|	-

- -| . $form->write_trigger(\%myconfig, 2, - "transdatefrom", "BL", "trigger_transdatefrom", - "transdateto", "BL", "trigger_transdateto") . qq| - - - - - - - - - - - - - - -{login}> -{password}> - -
- -

- - - -|; - - $lxdebug->leave_sub(); + $::lxdebug->enter_sub; + $::auth->assert('datev_export'); + + $::form->header; + print $::form->parse_html_template('datev/export_bewegungsdaten'); + + $::lxdebug->leave_sub; } sub export_stammdaten { - $lxdebug->enter_sub(); - - $form->{title} = $locale->text("DATEX - Export Assistent"); - - $form->header; - - print qq| - - -

{script}> - - - - - - - - - - - - - - -

$form->{title}

| . $locale->text("Konten") . qq|

- - - - - - - - - -

\| . $locale->text('Von Konto: ') . qq\|
\| . $locale->text('Bis Konto: ') . qq\|

- - - - - - - - - - - - - -{login}> -{password}> - -
- -

- - - -|; - - $lxdebug->leave_sub(); + $::lxdebug->enter_sub; + $::auth->assert('datev_export'); + + $::form->header; + print $::form->parse_html_template('datev/export_stammdaten'); + + $::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(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|); + + 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|
| . $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(""); - $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ü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"); - print("Content-Type: application/zip\n"); - print("Content-Disposition: attachment; filename=\"${zip_name}\"\n\n"); - while () { - print($_); - } + $::locale->with_raw_io(\*STDOUT, sub { + print("Content-Type: application/zip\n"); + print("Content-Disposition: attachment; filename=\"${zip_name}\"\n\n"); + while () { + print($_); + } + }); close(IN); unlink($tmp_name); - $lxdebug->leave_sub(); + DATEV::clean_temporary_directories(); + + $main::lxdebug->leave_sub(); }