From: Ema-Andreea Ghiurca Date: Wed, 23 Oct 2019 09:41:19 +0000 (+0200) Subject: Historie zeigt Einträge von anderen Belegen X-Git-Tag: kivitendo-mebil_0.1-0~10^2~2^2~348 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=000ba9b8aba4ba5c32507544afd7d790b53e11a7;p=kivitendo-erp.git Historie zeigt Einträge von anderen Belegen ticket #11167 (cherry picked from commit 59eb76522127c336bdf68cacb84a83d49ab19f75) (cherry-pick von odyn) --- diff --git a/bin/mozilla/common.pl b/bin/mozilla/common.pl index 2f9df9ed3..8cbdac75c 100644 --- a/bin/mozilla/common.pl +++ b/bin/mozilla/common.pl @@ -239,10 +239,10 @@ sub show_history { my $callback = build_std_url(qw(action longdescription trans_id_type input_name)); my $restriction; - if ( $form->{trans_id_type} eq 'glid' ) { - $restriction = "AND ( snumbers LIKE 'invnumber%' OR what_done LIKE '%Buchungsnummer%' OR snumbers LIKE 'gltransaction%' OR snumbers LIKE 'emailjournal%' ) "; - } elsif ( $form->{trans_id_type} eq 'id' ) { - $restriction = " AND ( snumbers NOT LIKE 'invnumber_%' AND snumbers NOT LIKE 'gltransaction%' AND (what_done NOT LIKE '%Buchungsnummer%' OR what_done IS null))"; + if ( $form->{trans_id_type} eq 'glid' ) { # for invoices + $restriction = "AND ( snumbers LIKE 'invnumber%' OR what_done LIKE '%Buchungsnummer%' OR snumbers LIKE 'gltransaction%' OR (snumbers LIKE 'emailjournal%' AND what_done ~ 'invoice|credit_note') ) "; + } elsif ( $form->{trans_id_type} eq 'id' ) { # for non invoices + $restriction = " AND ( snumbers NOT LIKE 'invnumber_%' AND snumbers NOT LIKE 'gltransaction%' AND (what_done NOT LIKE '%Buchungsnummer%' AND what_done NOT LIKE '%invoice%' OR what_done IS null))"; } else { $restriction = ''; };