X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAP.pm;h=9215ab710d47797979051f35d053dda893353726;hb=e90048c8180f32f52f3f12ee52eb7269c4b27fcf;hp=04e1ade073ae66ee694223e419f116b5113f1ec9;hpb=96dbc0768869a53c1d146efbc0bd364c2ea9de63;p=kivitendo-erp.git

diff --git a/SL/AP.pm b/SL/AP.pm
index 04e1ade07..9215ab710 100644
--- a/SL/AP.pm
+++ b/SL/AP.pm
@@ -170,9 +170,10 @@ sub post_transaction {
       $uid = substr($uid, 2, 75);
 
       $query =
-        qq|INSERT INTO ap (invnumber, employee_id) | .
-        qq|VALUES (?, (SELECT e.id FROM employee e WHERE e.login = ?))|;
-      do_query($form, $dbh, $query, $uid, $form->{login});
+        qq|INSERT INTO ap (invnumber, employee_id,currency_id) | .
+        qq|VALUES (?, (SELECT e.id FROM employee e WHERE e.login = ?),
+                      (SELECT id FROM currencies WHERE name = ?) )|;
+      do_query($form, $dbh, $query, $uid, $form->{login}, $form->{currency});
 
       $query = qq|SELECT a.id FROM ap a
                   WHERE a.invnumber = ?|;
@@ -370,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 | .
@@ -415,6 +416,7 @@ sub post_transaction {
       dbh        => $dbh,
       from       => $transdate,
       to         => $transdate,
+      trans_id   => $form->{id},
     );
 
     $datev->export;
@@ -489,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}) {
@@ -876,4 +883,3 @@ sub storno {
 }
 
 1;
-