Merge branch 'master' of http://wagnertech.de/git/mfinanz

[mfinanz.git] / SL / Controller / PayPostingImport.pm

diff --git a/SL/Controller/PayPostingImport.pm b/SL/Controller/PayPostingImport.pm
index c8d39091d7d604af37b5e4aad8f42990ee2856c8..733dc5d28adad8b03ef98e13728f5c9739559bed 100644 (file)
--- a/SL/Controller/PayPostingImport.pm
+++ b/SL/Controller/PayPostingImport.pm
@@ -17,7 +17,15 @@ sub action_upload_pay_postings {
   my ($self, %params) = @_;
 
   $self->setup_pay_posting_action_bar;
-  $self->render('pay_posting_import/form', title => $::locale->text('Import Pay Postings'));
+
+  # new closedto
+  my $today = DateTime->now();
+  $today->subtract(months => 1);
+
+  my $dt = DateTime->last_day_of_month(year  => $today->year, month => $today->month);
+
+  my $new_closedto = $dt->to_kivitendo();
+  $self->render('pay_posting_import/form', title => $::locale->text('Import Pay Postings'), closedto => $new_closedto);
 }
 
 sub action_import_datev_pay_postings {
@@ -39,6 +47,9 @@ sub action_import_datev_pay_postings {
   if (parse_and_import($self)) {
     flash_later('info', t8("All pay postings successfully imported."));
   }
+  if ($::form->{set_closedto} && _set_closedto($self)) {
+    flash_later('info', t8("Books closed until:") . ' ' . $::form->{closedto});
+  }
   $self->setup_pay_posting_action_bar;
   $self->render('pay_posting_import/form', title => $::locale->text('Imported Pay Postings'));
 }
@@ -124,6 +135,19 @@ sub parse_and_import {
   }) or do { die t8("Cannot add Booking, reason: #1 DB: #2 ", $@, SL::DB->client->error) };
 }
 
+
+sub _set_closedto {
+  my $self     = shift;
+  die "no date:" . $::form->{closedto} unless $::form->{closedto};
+
+  my $defaults   = SL::DB::Default->get;
+
+  $defaults->closedto(DateTime->from_kivitendo($::form->{closedto}));
+  $defaults->save || die "Cannot save closedto!";
+
+  return 1;
+}
+
 sub check_auth {
   $::auth->assert('general_ledger');
 }