From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 12 Nov 2012 10:25:47 +0000 (+0100)
Subject: Kontoübersicht: Unterscheidung nach Bilanzierung/EUR entfernt
X-Git-Tag: release-3.0.0beta1~4^2~7
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=ae0968da936081958f693038457012979570fc54;p=kivitendo-erp.git

Kontoübersicht: Unterscheidung nach Bilanzierung/EUR entfernt

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.
---

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) %]
 
 <table border=0 width=100%>
@@ -70,11 +69,6 @@
         <tr>
                    <td colspan=5><hr size=3 noshade></td>
         </tr>
-        <tr>
-          <th align=leftt>[% 'Method' | $T8 %]</th>
-          <td colspan=3>[% 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')) %]</td>
-        </tr>
         <tr>
          <th align=right colspan=4>[% 'Decimalplaces' | $T8 %]</th>
          <td><input name=decimalplaces size=3 value="2"></td>
@@ -88,4 +82,3 @@
 
 <br>[% L.submit_tag('action', LxERP.t8('List Transactions')) %]
 </form>
-