From: Bernd Bleßmann <bernd@kivitendo-premium.de>
Date: Mon, 12 Jul 2021 09:47:39 +0000 (+0200)
Subject: Ek-Rg: verschiedene Buchungs-Aktionen je nach Mandantenkonfig
X-Git-Tag: kivitendo-mebil_0.1-0~9^2~38
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=a59c4c737b249602aa34ff33e0c4274b8d50adab;p=kivitendo-erp.git

Ek-Rg: verschiedene Buchungs-Aktionen je nach Mandantenkonfig

- DMS aus: Verhalten wie zuvor

- DMS an und "Dokumente für Dialogbuchung hinzufügen" eingestellt:
  "Buchen" bucht und führt im selben Beleg zum DMS-Tab.

- DMS an und "Dokumente für Dialogbuchung hinzufügen" ausgestellt:
  "Buchen" (Haupt-Aktion) bucht und führt zum selben Beleg (wie vorher).
  Es gibt eine zweite Aktion "Buchen und Dokument hochladen". Diese bucht und
  führt im selben Beleg zum DMS-Tab.
---

diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index 069b9a780..cca6d12f1 100644
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -260,6 +260,35 @@ sub setup_ir_action_bar {
 
     $is_linked_bank_transaction = 1;
   }
+
+  my $create_post_action = sub {
+    # $_[0]: description
+    # $_[1]: after_action
+    action => [
+      $_[0],
+      submit   => [ '#form', { action => "post", after_action => $_[1] } ],
+      checks   => [ 'kivi.validate_form' ],
+      checks   => [ 'kivi.validate_form', 'kivi.AP.check_fields_before_posting', 'kivi.AP.check_duplicate_invnumber' ],
+      disabled => !$may_edit_create                         ? t8('You must not change this invoice.')
+                : $form->{locked}                           ? t8('The billing period has already been locked.')
+                : $form->{storno}                           ? t8('A canceled invoice cannot be posted.')
+                : ($form->{id} && $change_never)            ? t8('Changing invoices has been disabled in the configuration.')
+                : ($form->{id} && $change_on_same_day_only) ? t8('Invoices can only be changed on the day they are posted.')
+                : $is_linked_bank_transaction               ? t8('This transaction is linked with a bank transaction. Please undo and redo the bank transaction booking if needed.')
+                :                                             undef,
+    ],
+  };
+
+  my @post_entries;
+  if ($::instance_conf->get_ir_add_doc && $::instance_conf->get_doc_storage) {
+    @post_entries = ( $create_post_action->(t8('Post'), 'doc-tab') );
+  } elsif ($::instance_conf->get_doc_storage) {
+    @post_entries = ( $create_post_action->(t8('Post')),
+                      $create_post_action->(t8('Post and upload document'), 'doc-tab') );
+  } else {
+    @post_entries = ( $create_post_action->(t8('Post')) );
+  }
+
   for my $bar ($::request->layout->get('actionbar')) {
     $bar->add(
       action => [
@@ -269,21 +298,8 @@ sub setup_ir_action_bar {
         accesskey => 'enter',
         disabled  => !$may_edit_create ? t8('You must not change this invoice.') : undef,
       ],
-
       combobox => [
-        action => [
-          t8('Post'),
-          submit   => [ '#form', { action => "post" } ],
-          checks   => [ 'kivi.validate_form' ],
-          checks   => [ 'kivi.validate_form', 'kivi.AP.check_fields_before_posting', 'kivi.AP.check_duplicate_invnumber' ],
-          disabled => !$may_edit_create                         ? t8('You must not change this invoice.')
-                    : $form->{locked}                           ? t8('The billing period has already been locked.')
-                    : $form->{storno}                           ? t8('A canceled invoice cannot be posted.')
-                    : ($form->{id} && $change_never)            ? t8('Changing invoices has been disabled in the configuration.')
-                    : ($form->{id} && $change_on_same_day_only) ? t8('Invoices can only be changed on the day they are posted.')
-                    : $is_linked_bank_transaction               ? t8('This transaction is linked with a bank transaction. Please undo and redo the bank transaction booking if needed.')
-                    :                                             undef,
-        ],
+        @post_entries,
         action => [
           t8('Post Payment'),
           submit   => [ '#form', { action => "post_payment" } ],
@@ -938,7 +954,7 @@ sub post {
     # /saving the history
 
     my $redirect_url;
-    if ($::instance_conf->get_ir_add_doc && $::instance_conf->get_doc_storage) {
+    if ('doc-tab' eq $form->{after_action}) {
       $redirect_url = build_std_url("script=ir.pl", 'action=edit', 'id=' . E($form->{id}), 'fragment=ui-tabs-docs');
     } else {
       $redirect_url = build_std_url("script=ir.pl", 'action=edit', 'id=' . E($form->{id}));