X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAP.pm;h=9215ab710d47797979051f35d053dda893353726;hb=e6de5d289ce87cf3a44511e1fc6313ea86d0f5e7;hp=7a148d6101e0ce3774de1dbfffd2d0d2228350ce;hpb=2accdcbd5f820238b1c09ef2f42823a70041108a;p=kivitendo-erp.git diff --git a/SL/AP.pm b/SL/AP.pm index 7a148d610..9215ab710 100644 --- a/SL/AP.pm +++ b/SL/AP.pm @@ -371,7 +371,7 @@ sub post_transaction { $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, fx_transaction, cleared, project_id, taxkey, tax_id, chart_link) | . qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, 't', 'f', ?, | . - qq| (SELECT taxkey_id FROM chart WHERE accno = ?)| . + qq| (SELECT taxkey_id FROM chart WHERE accno = ?),| . qq| (SELECT tax_id| . qq| FROM taxkeys| . qq| WHERE chart_id= (SELECT id | . @@ -491,6 +491,11 @@ sub ap_transactions { qq|LEFT JOIN payment_terms pt ON (pt.id = v.payment_id)|; my $where = ''; + + unless ( $::auth->assert('show_ap_transactions', 1) ) { + $where .= " AND NOT invoice = 'f' "; # remove ap transactions from Sales -> Reports -> Invoices + }; + my @values; if ($form->{vendor_id}) { @@ -878,4 +883,3 @@ sub storno { } 1; -