From: Martin Helmling martin.helmling@octosoft.eu <martin.helmling@octosoft.eu>
Date: Wed, 16 Nov 2016 18:09:53 +0000 (+0100)
Subject: Bankimport: Kontenabgleich mit Bank - Tab "Vorschläge" aktivieren
X-Git-Tag: release-3.5.4~1920
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=5eaed5899d7c965d54fa932f37a168f450bd4002;p=kivitendo-erp.git

Bankimport: Kontenabgleich mit Bank - Tab "Vorschläge" aktivieren

Falls Vorschäge gefunden werden,
werden diese gleich angezeigt.
Dazu wird ui_tab über cookie geschaltet
---

diff --git a/SL/Controller/Reconciliation.pm b/SL/Controller/Reconciliation.pm
index 1236c4465..1bfd3905d 100644
--- a/SL/Controller/Reconciliation.pm
+++ b/SL/Controller/Reconciliation.pm
@@ -35,11 +35,14 @@ sub action_search {
 sub action_reconciliation {
   my ($self) = @_;
 
+  $self->_get_proposals;
+
   $self->_get_linked_transactions;
 
   $self->_get_balances;
 
   $self->render('reconciliation/form',
+                ui_tab => scalar(@{$self->{PROPOSALS}}) > 0?1:0,
                 title => t8('Reconciliation'));
 }
 
diff --git a/templates/webpages/reconciliation/form.html b/templates/webpages/reconciliation/form.html
index d8c0844fe..ba689a313 100644
--- a/templates/webpages/reconciliation/form.html
+++ b/templates/webpages/reconciliation/form.html
@@ -24,7 +24,7 @@ html, body {
 </style>
 
 <div class="listtop">[% title %]</div>
-
+xx[% ui_tab %]yy
 [%- INCLUDE 'common/flash.html' %]
 
 <form id="reconciliation_form" method="post" action="controller.pl" style="height:100%">
@@ -80,14 +80,20 @@ html, body {
 
   [% L.submit_tag('submit_filter', LxERP.t8("Filter"), onclick='filter_table();return false;', style='display: none') %]
 
-  <div class="tabwidget" style="height:100%">
+  <div id="reconc_tabs" class="tabwidget" style="height:100%">
     <ul>
       <li><a href="#overview" onclick="load_overview();">[% 'Overview' | $T8 %]</a></li>
       <li><a href="#automatic" onclick="load_proposals();">[% 'Proposals' | $T8 %]</a></li>
     </ul>
 
-    <div id="overview" style="height:calc(100% - 60px);overflow: auto;">[% PROCESS "reconciliation/tabs/overview.html" %]</div>
-    <div id="automatic" style="height:calc(100% - 60px);overflow: auto;"></div>
+    <div id="overview" style="height:calc(100% - 60px);overflow: auto;">
+    [%- IF ui_tab == 0 %]
+    [% PROCESS "reconciliation/tabs/overview.html" %]
+    [%- END %]</div>
+    <div id="automatic" style="height:calc(100% - 60px);overflow: auto;">
+    [%- IF ui_tab == 1 %]
+    [% PROCESS "reconciliation/tabs/automatic.html" %]
+    [%- END %]    </div>
   </div>
 
 </form>
@@ -121,6 +127,8 @@ function load_overview () {
   });
 }
 
+$.cookie('jquery_ui_tab_reconc_tabs', [% ui_tab %] );
+
 //-->
 </script>