From b755a636043b110ad180bb0e6b331e4fbe0cc68c Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 21 Mar 2017 13:21:48 +0100
Subject: [PATCH] =?utf8?q?ActionBar:=20Verwendung=20bei=20=C2=BBEinkauf?=
 =?utf8?q?=C2=AB=20=E2=86=92=20=C2=BBBerichte=C2=AB=20=E2=86=92=20=C2=BBEi?=
 =?utf8?q?nkaufsrechnungen=E2=80=A6=C2=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 bin/mozilla/ap.pl                             | 38 ++++++++++++++++++-
 menus/user/00-erp.yaml                        |  1 -
 .../webpages/ap/ap_transactions_bottom.html   | 11 ------
 templates/webpages/ap/search.html             |  8 +---
 4 files changed, 38 insertions(+), 20 deletions(-)
 delete mode 100644 templates/webpages/ap/ap_transactions_bottom.html

diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index 8dc258460..3599cbada 100644
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -915,6 +915,8 @@ sub search {
 
   $::request->layout->add_javascripts("autocomplete_project.js");
 
+  setup_ap_search_action_bar();
+
   $form->header;
   print $form->parse_html_template('ap/search', { %myconfig });
 
@@ -1030,7 +1032,6 @@ sub ap_transactions {
   push @options, $locale->text('Closed')                                                                 if ($form->{closed});
 
   $report->set_options('top_info_text'        => join("\n", @options),
-                       'raw_bottom_info_text' => $form->parse_html_template('ap/ap_transactions_bottom'),
                        'output_format'        => 'HTML',
                        'title'                => $form->{title},
                        'attachment_basename'  => $locale->text('vendor_invoice_list') . strftime('_%Y%m%d', localtime time),
@@ -1105,6 +1106,7 @@ sub ap_transactions {
   $report->add_separator();
   $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal'));
 
+  setup_ap_transactions_action_bar();
   $report->generate_with_headers();
 
   $main::lxdebug->leave_sub();
@@ -1143,6 +1145,40 @@ sub storno {
   $main::lxdebug->leave_sub();
 }
 
+sub setup_ap_search_action_bar {
+  my %params = @_;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        $::locale->text('Search'),
+        submit    => [ '#form', { action => "ap_transactions" } ],
+        accesskey => 'enter',
+      ],
+    );
+  }
+}
+
+sub setup_ap_transactions_action_bar {
+  my %params = @_;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      combobox => [
+        action => [ t8('Add') ],
+        link => [
+          t8('Purchase Invoice'),
+          link => [ 'ir.pl?action=add' ],
+        ],
+        link => [
+          t8('AP Transaction'),
+          link => [ 'ap.pl?action=add' ],
+        ],
+      ], # end of combobox "Add"
+    );
+  }
+}
+
 sub setup_ap_display_form_action_bar {
   my $transdate               = $::form->datetonum($::form->{transdate}, \%::myconfig);
   my $closedto                = $::form->datetonum($::form->{closedto},  \%::myconfig);
diff --git a/menus/user/00-erp.yaml b/menus/user/00-erp.yaml
index 53e8795a6..3c492a6cf 100644
--- a/menus/user/00-erp.yaml
+++ b/menus/user/00-erp.yaml
@@ -459,7 +459,6 @@
   module: ap.pl
   params:
     action: search
-    nextsub: ap_transactions
 - parent: ap_reports
   id: ap_reports_delivery_plan
   name: Delivery Plan
diff --git a/templates/webpages/ap/ap_transactions_bottom.html b/templates/webpages/ap/ap_transactions_bottom.html
deleted file mode 100644
index dc2f2f543..000000000
--- a/templates/webpages/ap/ap_transactions_bottom.html
+++ /dev/null
@@ -1,11 +0,0 @@
-[% USE T8 %][% USE HTML %] <form method="post" action="dispatcher.pl?M=ap">
-
-  <input name="callback" type="hidden" value="[% callback %]">
-
-  [% 'Create new' | $T8 %]<br>
-
-  <input class="submit" type="submit" name="A_ap_transaction" value="[%- 'AP Transaction' | $T8 %]">
-  <input class="submit" type="submit" name="A_vendor_invoice" value="[%- 'Vendor Invoice' | $T8 %]">
-
- </form>
-
diff --git a/templates/webpages/ap/search.html b/templates/webpages/ap/search.html
index d7dfbf3e2..5170b1fcd 100644
--- a/templates/webpages/ap/search.html
+++ b/templates/webpages/ap/search.html
@@ -3,7 +3,7 @@
 [% SET style="width: 250px" %]
 <h1>[% title %]</h1>
 
- <form method=post name="search" action=[% script %]>
+ <form method="post" name="search" action="ap.pl" id="form">
 
   <table width=100%>
   <tr>
@@ -137,11 +137,5 @@
       </table>
      </td>
     </tr>
-    <tr>
-     <td><hr size=3 noshade></td>
-    </tr>
    </table>
-   <input type=hidden name=nextsub value=[% nextsub %]>
-   <br>
-   <input class=submit type=submit name=action value="[% 'Continue' | $T8 %]">
   </form>
-- 
2.20.1