From ae0968da936081958f693038457012979570fc54 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Mon, 12 Nov 2012 11:25:47 +0100 Subject: [PATCH] =?utf8?q?Konto=C3=BCbersicht:=20Unterscheidung=20nach=20B?= =?utf8?q?ilanzierung/EUR=20entfernt?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Bei einem Konto ergibt es keinen Sinn, auch Buchungen außerhalb des Zeitraumes anzuzeigen. Dafür gibt es GuV, Bilanz etc. Also die Auswahlmöglichkeit dafür entfernen. Fixt #1893. --- SL/CA.pm | 16 ---------------- bin/mozilla/ca.pl | 1 - templates/webpages/ca/list.html | 7 ------- 3 files changed, 24 deletions(-) diff --git a/SL/CA.pm b/SL/CA.pm index 52d2b0baf..577d6b98a 100644 --- a/SL/CA.pm +++ b/SL/CA.pm @@ -203,22 +203,6 @@ sub all_transactions { $project = qq| AND ac.project_id = ? |; @project_values = (conv_i($form->{project_id})); } - my $acc_cash_where = ""; - my $ar_cash_where = ""; - my $ap_cash_where = ""; - - - if ($form->{method} eq "cash") { - $where = qq| (ac.trans_id IN (SELECT id FROM ar WHERE datepaid>= ? AND datepaid<= ? UNION SELECT id FROM ap WHERE datepaid>= ? AND datepaid<= ? UNION SELECT id FROM gl WHERE transdate>= ? AND transdate<= ?)) |; - @where_values = (); - push(@where_values, conv_date($form->{fromdate})); - push(@where_values, conv_date($form->{todate})); - push(@where_values, conv_date($form->{fromdate})); - push(@where_values, conv_date($form->{todate})); - push(@where_values, conv_date($form->{fromdate})); - push(@where_values, conv_date($form->{todate})); - } - if ($form->{accno}) { diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl index 4cababbe6..da3bfb029 100644 --- a/bin/mozilla/ca.pl +++ b/bin/mozilla/ca.pl @@ -157,7 +157,6 @@ sub list { $::form->header; print $::form->parse_html_template('ca/list', { year => DateTime->today->year, - cash => $::instance_conf->get_accounting_method eq 'cash', }); $::lxdebug->leave_sub; diff --git a/templates/webpages/ca/list.html b/templates/webpages/ca/list.html index 82cd1807e..e779a66e6 100644 --- a/templates/webpages/ca/list.html +++ b/templates/webpages/ca/list.html @@ -7,7 +7,6 @@ [% L.hidden_tag('accno', accno) %] [% L.hidden_tag('decription', description) %] [% L.hidden_tag('sort', 'transdate') %] -[% L.hidden_tag('eur', cash) %] [% L.hidden_tag('accounttype', accounttype) %] @@ -70,11 +69,6 @@ - - - - @@ -88,4 +82,3 @@
[% L.submit_tag('action', LxERP.t8('List Transactions')) %] - -- 2.20.1

[% 'Method' | $T8 %][% L.radio_button_tag('method', value='accrual', checked=!cash, label=LxERP.t8('Accrual')) %] - [% L.radio_button_tag('method', value='cash', checked=cash, label=LxERP.t8('EUR')) %]
[% 'Decimalplaces' | $T8 %]