X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdatev.pl;h=8604da00d42673b337a144deeb0e57f0ea801d59;hb=b391b42da949cd0c2a9c8c1860042e19eb0e62c2;hp=8915d2f8b90dd9d182781757774f73cc803ecde9;hpb=554034c0587282b99d58cf42758b2f836367f2eb;p=kivitendo-erp.git

diff --git a/bin/mozilla/datev.pl b/bin/mozilla/datev.pl
index 8915d2f8b..8604da00d 100644
--- a/bin/mozilla/datev.pl
+++ b/bin/mozilla/datev.pl
@@ -1,5 +1,5 @@
 #=====================================================================
-# Lx-Office ERP
+# kivitendo ERP
 # Copyright (c) 2004
 #
 #  Author: Philip Reetz
@@ -18,7 +18,8 @@
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.
 #======================================================================
 #
 # Datev export module
@@ -29,7 +30,8 @@ use POSIX qw(strftime getcwd);
 use Archive::Zip qw(:ERROR_CODES :CONSTANTS);
 
 use SL::Common;
-use SL::DATEV;
+use SL::DATEV qw(:CONSTANTS);
+use SL::Locale::String qw(t8);
 
 use strict;
 
@@ -45,9 +47,12 @@ sub export {
   $::lxdebug->enter_sub;
   $::auth->assert('datev_export');
 
-  DATEV->get_datev_stamm(\%::myconfig, $::form);
+  my $stamm = SL::DATEV->new->get_datev_stamm;
+
+  setup_datev_export_action_bar();
+
   $::form->header;
-  print $::form->parse_html_template('datev/export');
+  print $::form->parse_html_template('datev/export', $stamm);
 
   $::lxdebug->leave_sub;
 }
@@ -68,6 +73,8 @@ sub export_bewegungsdaten {
   $::lxdebug->enter_sub;
   $::auth->assert('datev_export');
 
+  setup_datev_export2_action_bar();
+
   $::form->header;
   print $::form->parse_html_template('datev/export_bewegungsdaten');
 
@@ -78,6 +85,8 @@ sub export_stammdaten {
   $::lxdebug->enter_sub;
   $::auth->assert('datev_export');
 
+  setup_datev_export2_action_bar();
+
   $::form->header;
   print $::form->parse_html_template('datev/export_stammdaten');
 
@@ -85,48 +94,43 @@ sub export_stammdaten {
 }
 
 sub export3 {
-  $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();
+  $::lxdebug->enter_sub;
+  $::auth->assert('datev_export');
 
-  DATEV->save_datev_stamm(\%myconfig, \%$form);
+  my %data = (
+    exporttype => $::form->{exporttype} ? DATEV_ET_STAMM : DATEV_ET_BUCHUNGEN,
+    format     => $::form->{kne}        ? DATEV_FORMAT_KNE : DATEV_FORMAT_OBE,
+  );
+
+  if ($::form->{exporttype} == DATEV_ET_STAMM) {
+    $data{accnofrom}  = $::form->{accnofrom},
+    $data{accnoto}    = $::form->{accnoto},
+  } elsif ($::form->{exporttype} == DATEV_ET_BUCHUNGEN) {
+    @data{qw(from to)} = _get_dates(
+      $::form->{zeitraum}, $::form->{monat}, $::form->{quartal},
+      $::form->{transdatefrom}, $::form->{transdateto},
+    );
+  } else {
+    die 'invalid exporttype';
+  }
 
-  my $link = "datev.pl?action=download&download_token=";
+  my $datev = SL::DATEV->new(%data);
 
-  if ($form->{kne}) {
-    my $result = DATEV->kne_export(\%myconfig, \%$form);
-    if ($result && @{ $result->{filenames} }) {
-      $link .= Q($result->{download_token});
+  $datev->clean_temporary_directories;
+  $datev->save_datev_stamm($::form);
 
-      print(qq|<br><b>| . $locale->text('KNE-Export erfolgreich!') . qq|</b><br><br><a href="$link">Download</a>|);
+  $datev->export;
 
-      print $form->parse_html_template('datev/net_gross_difference') if @{ $form->{net_gross_differences} };
+  if (!$datev->errors) {
+    setup_datev_export3_action_bar(download_token => $datev->download_token);
 
-    } else {
-      $form->error("KNE-Export schlug fehl.");
-    }
+    $::form->header;
+    print $::form->parse_html_template('datev/export3');
   } else {
-    # 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.");
-    # }
+    $::form->error("Export schlug fehl.\n" . join "\n", $datev->errors);
   }
 
-  print("</body></html>");
-
-  $main::lxdebug->leave_sub();
+  $::lxdebug->leave_sub;
 }
 
 sub download {
@@ -135,14 +139,16 @@ sub download {
   my $form     = $main::form;
   my $locale   = $main::locale;
 
-  $main::auth->assert('datev_export');
+  $::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("kivitendo-datev-export-%Y%m%d.zip", localtime(time()));
 
   my $cwd = getcwd();
 
-  my $path = DATEV::get_path_for_download_token($form->{download_token});
+  my $datev = SL::DATEV->new(download_token => $form->{download_token});
+
+  my $path = $datev->export_path;
   if (!$path) {
     $form->error($locale->text("Your download does not exist anymore. Please re-run the DATEV export assistant."));
   }
@@ -153,7 +159,6 @@ sub download {
 
   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."));
   }
 
@@ -175,7 +180,80 @@ sub download {
 
   unlink($tmp_name);
 
-  DATEV::clean_temporary_directories();
-
   $main::lxdebug->leave_sub();
 }
+
+sub _get_dates {
+  $::lxdebug->enter_sub;
+
+  my ($mode, $month, $quarter, $transdatefrom, $transdateto) = @_;
+  my ($fromdate, $todate);
+
+  if ($mode eq "monat") {
+    $fromdate = DateTime->new(day => 1, month => $month, year => DateTime->today->year);
+    $todate   = $fromdate->clone->add(months => 1)->add(days => -1);
+  } elsif ($mode eq "quartal") {
+    die 'quarter out of of bounds' if $quarter < 1 || $quarter > 4;
+    $fromdate = DateTime->new(day => 1, month => (3 * $quarter - 2), year => DateTime->today->year);
+    $todate   = $fromdate->clone->add(months => 3)->add(days => -1);
+  } elsif ($mode eq "zeit") {
+    $fromdate = DateTime->from_lxoffice($transdatefrom);
+    $todate   = DateTime->from_lxoffice($transdateto);
+    die 'need from and to time' unless $fromdate && $todate;
+  } else {
+    die 'undefined interval mode';
+  }
+
+  $::lxdebug->leave_sub;
+
+  return ($fromdate, $todate);
+}
+
+sub setup_datev_export_action_bar {
+  my %params = @_;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Continue'),
+        submit    => [ '#form', { action => 'export2' } ],
+        accesskey => 'enter',
+      ],
+    );
+  }
+}
+
+sub setup_datev_export2_action_bar {
+  my %params = @_;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Export'),
+        submit    => [ '#form', { action => 'export3' } ],
+        accesskey => 'enter',
+      ],
+      action => [
+        t8('Back'),
+        call => [ 'kivi.history_back' ],
+      ],
+    );
+  }
+}
+
+sub setup_datev_export3_action_bar {
+  my %params = @_;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      link => [
+        t8('Download'),
+        link => [ 'datev.pl?action=download&download_token=' . $::form->escape($params{download_token}) ],
+      ],
+      action => [
+        t8('Back'),
+        call => [ 'kivi.history_back' ],
+      ],
+    );
+  }
+}