X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAP.pm;h=9215ab710d47797979051f35d053dda893353726;hb=2766521474b20c77e62d169a1c99efb41cb1c56f;hp=810a15e529dde57170709145d6ba3f3f1491b22d;hpb=be776964b83340e69fa2f02eae59b703c0c95b88;p=kivitendo-erp.git

diff --git a/SL/AP.pm b/SL/AP.pm
index 810a15e52..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 = ?|;
@@ -184,7 +185,7 @@ sub post_transaction {
     $query = qq|UPDATE ap SET
                 invnumber = ?, transdate = ?, ordnumber = ?, vendor_id = ?, taxincluded = ?,
                 amount = ?, duedate = ?, paid = ?, netamount = ?,
-                curr = (SELECT id FROM currencies WHERE curr = ?), notes = ?, department_id = ?, storno = ?, storno_id = ?,
+                currency_id = (SELECT id FROM currencies WHERE name = ?), notes = ?, department_id = ?, storno = ?, storno_id = ?,
                 globalproject_id = ?, direct_debit = ?
                WHERE id = ?|;
     @values = ($form->{invnumber}, conv_date($form->{transdate}),
@@ -240,13 +241,13 @@ sub post_transaction {
     $query =
       qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey, tax_id, chart_link) | .
       qq|VALUES (?, (SELECT 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 | . 
-      qq|                          FROM chart| . 
-      qq|                          WHERE accno = ?)| . 
-      qq|         AND startdate <= ?| . 
+      qq|        (SELECT taxkey_id FROM chart WHERE accno = ?),| .
+      qq|        (SELECT tax_id| .
+      qq|         FROM taxkeys| .
+      qq|         WHERE chart_id= (SELECT id | .
+      qq|                          FROM chart| .
+      qq|                          WHERE accno = ?)| .
+      qq|         AND startdate <= ?| .
       qq|         ORDER BY startdate DESC LIMIT 1),| .
       qq|        (SELECT c.link FROM chart c WHERE c.accno = ?))|;
     @values = ($form->{id}, $form->{AP_amounts}{payables}, $form->{payables},
@@ -298,12 +299,12 @@ sub post_transaction {
           qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, project_id, taxkey, tax_id, chart_link) | .
           qq|VALUES (?, (SELECT 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 | . 
-          qq|                          FROM chart| . 
-          qq|                          WHERE accno = ?)| . 
-          qq|         AND startdate <= ?| . 
+          qq|        (SELECT tax_id| .
+          qq|         FROM taxkeys| .
+          qq|         WHERE chart_id= (SELECT id | .
+          qq|                          FROM chart| .
+          qq|                          WHERE accno = ?)| .
+          qq|         AND startdate <= ?| .
           qq|         ORDER BY startdate DESC LIMIT 1),| .
           qq|        (SELECT c.link FROM chart c WHERE c.accno = ?))|;
         @values = ($form->{id}, $form->{AP_payables}, $amount,
@@ -319,13 +320,13 @@ sub post_transaction {
       $query =
         qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, gldate, source, memo, project_id, taxkey, tax_id, chart_link) | .
         qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, ?, ?, ?, | .
-        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 | . 
-        qq|                          FROM chart| . 
-        qq|                          WHERE accno = ?)| . 
-        qq|         AND startdate <= ?| . 
+        qq|         FROM taxkeys| .
+        qq|         WHERE chart_id= (SELECT id | .
+        qq|                          FROM chart| .
+        qq|                          WHERE accno = ?)| .
+        qq|         AND startdate <= ?| .
         qq|         ORDER BY startdate DESC LIMIT 1),| .
         qq|        (SELECT c.link FROM chart c WHERE c.accno = ?))|;
       @values = ($form->{id}, $form->{"AP_paid_account_$i"}, $form->{"paid_$i"},
@@ -344,12 +345,12 @@ sub post_transaction {
           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 tax_id| . 
-          qq|         FROM taxkeys| . 
-          qq|         WHERE chart_id= (SELECT id | . 
-          qq|                          FROM chart| . 
-          qq|                          WHERE accno = ?)| . 
-          qq|         AND startdate <= ?| . 
+          qq|        (SELECT tax_id| .
+          qq|         FROM taxkeys| .
+          qq|         WHERE chart_id= (SELECT id | .
+          qq|                          FROM chart| .
+          qq|                          WHERE accno = ?)| .
+          qq|         AND startdate <= ?| .
           qq|         ORDER BY startdate DESC LIMIT 1),| .
           qq|        (SELECT c.link FROM chart c WHERE c.accno = ?))|;
         @values = ($form->{id}, $form->{"AP_paid_account_$i"}, $amount,
@@ -370,16 +371,16 @@ 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 tax_id| . 
-          qq|         FROM taxkeys| . 
-          qq|         WHERE chart_id= (SELECT id | . 
-          qq|                          FROM chart| . 
-          qq|                          WHERE accno = ?)| . 
-          qq|         AND startdate <= ?| . 
+          qq|        (SELECT taxkey_id FROM chart WHERE accno = ?),| .
+          qq|        (SELECT tax_id| .
+          qq|         FROM taxkeys| .
+          qq|         WHERE chart_id= (SELECT id | .
+          qq|                          FROM chart| .
+          qq|                          WHERE accno = ?)| .
+          qq|         AND startdate <= ?| .
           qq|         ORDER BY startdate DESC LIMIT 1),| .
           qq|        (SELECT c.link FROM chart c WHERE c.accno = ?))|;
-        @values = ($form->{id}, 
+        @values = ($form->{id},
                    ($amount > 0) ? $form->{fxgain_accno} : $form->{fxloss_accno},
                    $amount, conv_date($form->{"datepaid_$i"}), $project_id,
                    ($amount > 0) ? $form->{fxgain_accno} : $form->{fxloss_accno},
@@ -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;
-