X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fgl.pl;h=69d3be46e37648ca2e6608788bc309f8cd360112;hb=850ba82b521647752529615b3d5d4383ea77b2e6;hp=16aaf775a768d0b917b64b7760873677136b3b21;hpb=5202b3e71b817c6a78845cd4c27773760ff408b6;p=kivitendo-erp.git

diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index 16aaf775a..69d3be46e 100644
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -43,7 +43,7 @@ use SL::DB::BankTransactionAccTrans;
 use SL::DB::Tax;
 use SL::FU;
 use SL::GL;
-use SL::Helper::Flash qw(flash);
+use SL::Helper::Flash qw(flash flash_later);
 use SL::IS;
 use SL::ReportGenerator;
 use SL::DBUtils qw(selectrow_query selectall_hashref_query);
@@ -158,9 +158,15 @@ sub save_record_template {
   my $template = $::form->{record_template_id} ? SL::DB::RecordTemplate->new(id => $::form->{record_template_id})->load : SL::DB::RecordTemplate->new;
   my $js       = SL::ClientJS->new(controller => SL::Controller::Base->new);
   my $new_name = $template->template_name_to_use($::form->{record_template_new_template_name});
-
   $js->dialog->close('#record_template_dialog');
 
+
+  # bank transactions need amounts for assignment
+  my $can_save = 0;
+  $can_save    = 1 if ($::form->{credit_1} > 0 && $::form->{debit_2} > 0 && $::form->{credit_2} == 0 && $::form->{debit_1} == 0);
+  $can_save    = 1 if ($::form->{credit_2} > 0 && $::form->{debit_1} > 0 && $::form->{credit_1} == 0 && $::form->{debit_2} == 0);
+  return $js->flash('error', t8('Can only save template if amounts,i.e. 1 for debit and credit are set.'))->render unless $can_save;
+
   my @items = grep {
     $_->{chart_id} && (($_->{tax_id} // '') ne '')
   } map {
@@ -1357,7 +1363,7 @@ sub post_transaction {
       die "No bank transaction found" unless $bt;
 
       $chart_id = SL::DB::Manager::BankAccount->find_by(id => $bt->local_bank_account_id)->chart_id;
-      die "no chart id:" unless $chart_id;
+      die "no chart id" unless $chart_id;
 
       $payment = SL::DB::Manager::AccTransaction->get_all(where => [ trans_id => $::form->{id},
                                                                      chart_link => { like => '%_paid%' },
@@ -1366,7 +1372,7 @@ sub post_transaction {
 
       # credit/debit * -1 matches the sign for bt.amount and bt.invoice_amount
 
-      die "Can only assign the full (partial) bank amount to a single general ledger booking" . $bt->not_assigned_amount . " " .  ($payment->[0]->amount * -1)
+      die "Can only assign the full (partial) bank amount to a single general ledger booking: " . $bt->not_assigned_amount . " " .  ($payment->[0]->amount * -1)
         unless (abs($bt->not_assigned_amount - ($payment->[0]->amount * -1)) < 0.001);
 
       $bt->update_attributes(invoice_amount => $bt->invoice_amount + ($payment->[0]->amount * -1));
@@ -1392,13 +1398,6 @@ sub post_transaction {
     1;
   }) or do { die SL::DB->client->error };
 
-  if ($form->{callback} =~ /BankTransaction/ && $form->{bt_id}) {
-    print $form->redirect_header($form->{callback});
-    $form->redirect($locale->text('GL transaction posted.') . ' ' . $locale->text('ID') . ': ' . $form->{id});
-  }
-
-  # remove or clarify
-  undef($form->{callback});
   $main::lxdebug->leave_sub();
 }
 
@@ -1424,8 +1423,24 @@ sub post {
                    )->webdav_path;
   }
 
-  $form->{callback} = build_std_url("action=add", "show_details");
-  $form->redirect($::locale->text("General ledger transaction '#1' posted", $form->{reference}));
+  my $msg = $::locale->text("General ledger transaction '#1' posted (ID: #2)", $form->{reference}, $form->{id});
+  if ($form->{callback} =~ /BankTransaction/ && $form->{bt_id}) {
+    $form->redirect($msg);
+
+  } elsif ($::instance_conf->get_gl_add_doc && $::instance_conf->get_doc_storage) {
+    # Redirect with callback containing a fragment does not work (by now)
+    # because the callback info is stored in the session an parsing the
+    # callback parameters does not support fragments (see SL::Form::redirect).
+    # So use flash_later for the message and redirect_headers for redirecting.
+    my $add_doc_url = build_std_url("script=gl.pl", 'action=edit', 'id=' . E($form->{id}), 'fragment=ui-tabs-docs');
+    SL::Helper::Flash::flash_later('info', $msg);
+    print $form->redirect_header($add_doc_url);
+    $::dispatcher->end_request;
+
+  } else {
+    $form->{callback} = build_std_url("action=add", "show_details");
+    $form->redirect($msg);
+  }
 
   $main::lxdebug->leave_sub();
 }