itmes_sorted liefert immer eine Array-Referenz ...

[kivitendo-erp.git] / SL / AP.pm

diff --git a/SL/AP.pm b/SL/AP.pm
index 54abcd1..bc5a362 100644 (file)
--- a/SL/AP.pm
+++ b/SL/AP.pm
@@ -55,7 +55,6 @@ sub post_transaction {
   my $exchangerate = 0;
 
   $form->{defaultcurrency} = $form->get_default_currency($myconfig);
-  delete $form->{currency} unless $form->{defaultcurrency};
 
   ($null, $form->{department_id}) = split(/--/, $form->{department});
 
@@ -185,7 +184,7 @@ sub post_transaction {
     $query = qq|UPDATE ap SET
                 invnumber = ?, transdate = ?, ordnumber = ?, vendor_id = ?, taxincluded = ?,
                 amount = ?, duedate = ?, paid = ?, netamount = ?,
-                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}),
@@ -241,13 +240,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},
@@ -299,12 +298,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,
@@ -320,13 +319,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"},
@@ -345,12 +344,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,
@@ -372,15 +371,15 @@ 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}, 
+        @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},
@@ -416,6 +415,7 @@ sub post_transaction {
       dbh        => $dbh,
       from       => $transdate,
       to         => $transdate,
+      trans_id   => $form->{id},
     );
 
     $datev->export;
@@ -665,7 +665,6 @@ sub post_payment {
 
   $form->{exchangerate}    = $form->format_amount($myconfig, $form->{exchangerate});
   $form->{defaultcurrency} = $form->get_default_currency($myconfig);
-  delete $form->{currency} unless $form->{defaultcurrency};
 
   # Get the AP accno.
   $query =