From 5eaed5899d7c965d54fa932f37a168f450bd4002 Mon Sep 17 00:00:00 2001 From: "Martin Helmling martin.helmling@octosoft.eu" Date: Wed, 16 Nov 2016 19:09:53 +0100 Subject: [PATCH] =?utf8?q?Bankimport:=20Kontenabgleich=20mit=20Bank=20-=20?= =?utf8?q?Tab=20"Vorschl=C3=A4ge"=20aktivieren?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Falls Vorschäge gefunden werden, werden diese gleich angezeigt. Dazu wird ui_tab über cookie geschaltet --- SL/Controller/Reconciliation.pm | 3 +++ templates/webpages/reconciliation/form.html | 16 ++++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) 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 {
[% title %]
- +xx[% ui_tab %]yy [%- INCLUDE 'common/flash.html' %]
@@ -80,14 +80,20 @@ html, body { [% L.submit_tag('submit_filter', LxERP.t8("Filter"), onclick='filter_table();return false;', style='display: none') %] -
+
-
[% PROCESS "reconciliation/tabs/overview.html" %]
-
+
+ [%- IF ui_tab == 0 %] + [% PROCESS "reconciliation/tabs/overview.html" %] + [%- END %]
+
+ [%- IF ui_tab == 1 %] + [% PROCESS "reconciliation/tabs/automatic.html" %] + [%- END %]
@@ -121,6 +127,8 @@ function load_overview () { }); } +$.cookie('jquery_ui_tab_reconc_tabs', [% ui_tab %] ); + //--> -- 2.20.1