get_vendor auf aktuellen Stand gebracht.
[kivitendo-erp.git] / SL / IR.pm
index 9ddc486..2a74e06 100644 (file)
--- a/SL/IR.pm
+++ b/SL/IR.pm
@@ -276,9 +276,9 @@ sub post_invoice {
             # add entry for inventory, this one is for the sold item
             if ($linetotal != 0) {
               $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
-                         transdate)
+                         transdate, taxkey)
                          VALUES ($ref->{trans_id}, $ref->{inventory_accno_id},
-                         $linetotal, '$ref->{transdate}')|;
+                         $linetotal, '$ref->{transdate}', (SELECT taxkey_id FROM chart WHERE id = $ref->{inventory_accno_id}))|;
               $dbh->do($query) || $form->dberror($query);
 
               # add expense
@@ -522,22 +522,24 @@ sub post_invoice {
 
       if ($form->{amount}{ $form->{id} }{ $form->{AP} } != 0) {
         $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
-                   transdate, project_id)
+                   transdate, taxkey, project_id)
                    VALUES ($form->{id}, (SELECT c.id FROM chart c
-                                       WHERE c.accno = '$form->{AP}'),
-                   $amount, '$form->{"datepaid_$i"}', ?)|;
-        do_query($form, $dbh, $query, $project_id);
+                                       WHERE c.accno = ?),
+                   $amount, '$form->{"datepaid_$i"}',
+                    (SELECT taxkey_id FROM chart WHERE accno = ?), ?)|;
+        do_query($form, $dbh, $query, $form->{AP}, $form->{AP}, $project_id);
       }
 
       # record payment
 
       $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
-                  source, memo, project_id)
+                  source, memo, taxkey, project_id)
                   VALUES ($form->{id}, (SELECT c.id FROM chart c
-                                     WHERE c.accno = '$accno'),
+                                     WHERE c.accno = ?),
                   $form->{"paid_$i"}, '$form->{"datepaid_$i"}',
-                 '$form->{"source_$i"}', '$form->{"memo_$i"}', ?)|;
-      do_query($form, $dbh, $query, $project_id);
+                 '$form->{"source_$i"}', '$form->{"memo_$i"}',
+                  (SELECT taxkey_id FROM chart WHERE accno = ?), ?)|;
+      do_query($form, $dbh, $query, $accno, $accno, $project_id);
 
       $exchangerate = 0;
 
@@ -591,10 +593,10 @@ sub post_invoice {
         ) {
 
         $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
-                   transdate, cleared, fx_transaction, project_id)
+                   transdate, cleared, fx_transaction, taxkey, project_id)
                    VALUES ($form->{id}, (SELECT c.id FROM chart c
                                        WHERE c.accno = '$accno'),
-                    $form->{fx}{$accno}{$transdate}, '$transdate', '0', '1', ?)|;
+                    $form->{fx}{$accno}{$transdate}, '$transdate', '0', '1', 0, ?)|;
         do_query($form, $dbh, $query, $project_id);
       }
     }
@@ -1001,99 +1003,67 @@ sub get_vendor {
                  FROM vendor v
                  LEFT JOIN business b ON b.id = v.business_id
                  LEFT JOIN payment_terms pt ON v.payment_id = pt.id
-                WHERE v.id = $form->{vendor_id}|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  $ref = $sth->fetchrow_hashref(NAME_lc);
+                WHERE v.id = ?|;
+  $ref = selectfirst_hashref_query($form, $dbh, $query, $form->{vendor_id});
   map { $form->{$_} = $ref->{$_} } keys %$ref;
-  $sth->finish;
 
   $form->{creditremaining} = $form->{creditlimit};
-  $query = qq|SELECT SUM(a.amount - a.paid)
-              FROM ap a
-             WHERE a.vendor_id = $form->{vendor_id}|;
-  $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  ($form->{creditremaining}) -= $sth->fetchrow_array;
-
-  $sth->finish;
+  $query = qq|SELECT SUM(a.amount - a.paid) FROM ap a WHERE a.vendor_id = ?|;
+  ($form->{creditremaining}) -= selectfirst_array_query($form, $dbh, $query, $form->{vendor_id});
 
   $query = qq|SELECT o.amount,
-                (SELECT e.sell FROM exchangerate e
-                WHERE e.curr = o.curr
-                AND e.transdate = o.transdate)
-             FROM oe o
-             WHERE o.vendor_id = $form->{vendor_id}
-             AND o.quotation = '0'
-             AND o.closed = '0'|;
-  $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  while (my ($amount, $exch) = $sth->fetchrow_array) {
+                (SELECT e.sell FROM exchangerate e 
+                 WHERE e.curr = o.curr AND e.transdate = o.transdate)
+             FROM oe o WHERE o.vendor_id = ?  
+                AND o.quotation = '0' AND o.closed = '0'|;
+  while (my ($amount, $exch) = selectfirst_array_query($form, $dbh, $query, $form->{vendor_id})) {
     $exch = 1 unless $exch;
     $form->{creditremaining} -= $amount * $exch;
   }
-  $sth->finish;
 
   # get shipto if we do not convert an order or invoice
   if (!$form->{shipto}) {
     map { delete $form->{$_} }
       qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax shiptoemail);
 
-    $query = qq|SELECT s.* FROM shipto s
-                WHERE s.trans_id = $form->{vendor_id} AND s.module= 'CT'|;
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
-
-    $ref = $sth->fetchrow_hashref(NAME_lc);
+    $query = qq|SELECT s.* FROM shipto s WHERE s.trans_id = ? AND s.module= 'CT'|;
+    $ref = selectfirst_hashref_query($form, $dbh, $query, $form->{vendor_id});
     map { $form->{$_} = $ref->{$_} } keys %$ref;
-    $sth->finish;
   }
 
   # get taxes for vendor
-  $query = qq|SELECT c.accno
-              FROM chart c
+  $query = qq|SELECT c.accno FROM chart c
              JOIN vendortax v ON (v.chart_id = c.id)
-             WHERE v.vendor_id = $form->{vendor_id}|;
-  $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
+             WHERE v.vendor_id = ?|;
   my $vendortax = ();
-  while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
-    $vendortax{ $ref->{accno} } = 1;
-  }
-  $sth->finish;
+  $ref = selectall_hashref_query($form, $dbh, $query, $form->{vendor_id});
+  map { $vendortax{ $_->{accno} } = 1 } @$ref;
 
   if (!$form->{id} && $form->{type} !~ /_(order|quotation)/) {
 
     # setup last accounts used
-    $query = qq|SELECT c.accno, c.description, c.link, c.category
+    $query = qq|SELECT c.id, c.accno, c.description, c.link, c.category
                FROM chart c
                JOIN acc_trans ac ON (ac.chart_id = c.id)
                JOIN ap a ON (a.id = ac.trans_id)
-               WHERE a.vendor_id = $form->{vendor_id}
-               AND NOT (c.link LIKE '%_tax%' OR c.link LIKE '%_paid%')
+               WHERE a.vendor_id = ?
+                AND NOT (c.link LIKE '%_tax%' OR c.link LIKE '%_paid%')
                AND a.id IN (SELECT max(a2.id) FROM ap a2
-                            WHERE a2.vendor_id = $form->{vendor_id})|;
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
+                            WHERE a2.vendor_id = ?)|;
+    $refs = selectall_hashref_query($form, $dbh, $query, $form->{vendor_id}, $form->{vendor_id});
 
     my $i = 0;
-    while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+    for $ref (@$refs) {
       if ($ref->{category} eq 'E') {
         $i++;
 
         if ($form->{initial_transdate}) {
-          my $tax_query =
-            qq|SELECT tk.tax_id, t.rate FROM taxkeys tk | .
-            qq|LEFT JOIN tax t ON tk.tax_id = t.id | .
-            qq|WHERE tk.chart_id = ? AND startdate <= ? | .
-            qq|ORDER BY tk.startdate DESC LIMIT 1|;
-          my ($tax_id, $rate) =
-            selectrow_query($form, $dbh, $tax_query, $ref->{id},
-                            $form->{initial_transdate});
+          my $tax_query = qq|SELECT tk.tax_id, t.rate FROM taxkeys tk
+                             LEFT JOIN tax t ON tk.tax_id = t.id
+                             WHERE tk.chart_id = ? AND startdate <= ?
+                             ORDER BY tk.startdate DESC LIMIT 1|;
+          my ($tax_id, $rate) = selectrow_query($form, $dbh, $tax_query, $ref->{id},
+                                                $form->{initial_transdate});
           $form->{"taxchart_$i"} = "${tax_id}--${rate}";
         }
 
@@ -1103,7 +1073,6 @@ sub get_vendor {
         $form->{APselected} = $form->{AP_1} = $ref->{accno};
       }
     }
-    $sth->finish;
     $form->{rowcount} = $i if ($i && !$form->{type});
   }
 
@@ -1355,11 +1324,12 @@ sub post_payment {
       $dbh->do($query) || $form->dberror($query);
 
       $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
-                  transdate, project_id)
+                  transdate, taxkey, project_id)
                   VALUES ($form->{id}, (SELECT c.id FROM chart c
-                                      WHERE c.accno = '$form->{AP}'),
-                  $amount, '$form->{"datepaid_$i"}', ?)|;
-      do_query($form, $dbh, $query, $project_id);
+                                      WHERE c.accno = ?),
+                  $amount, '$form->{"datepaid_$i"}',
+                  (SELECT taxkey_id FROM chart WHERE accno = ?), ?)|;
+      do_query($form, $dbh, $query, $form->{AP}, $form->{AP}, $project_id);
 
 
 
@@ -1368,12 +1338,13 @@ sub post_payment {
       $dbh->do($query) || $form->dberror($query);
 
       $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
-                  source, memo, project_id)
+                  source, memo, taxkey, project_id)
                   VALUES ($form->{id}, (SELECT c.id FROM chart c
-                                     WHERE c.accno = '$accno'),
+                                     WHERE c.accno = ?),
                  $form->{"paid_$i"}, '$form->{"datepaid_$i"}',
-                 '$form->{"source_$i"}', '$form->{"memo_$i"}', ?)|;
-      do_query($form, $dbh, $query, $project_id);
+                 '$form->{"source_$i"}', '$form->{"memo_$i"}',
+                  (SELECT taxkey_id FROM chart WHERE accno = ?), ?)|;
+      do_query($form, $dbh, $query, $accno, $accno, $project_id);
 
 
       # gain/loss
@@ -1411,12 +1382,13 @@ sub post_payment {
                                         WHERE c.accno = '$accno') AND amount=$form->{fx}{$accno}{$transdate} AND transdate='$transdate' AND cleared='0' AND fx_transaction='1'|;
         $dbh->do($query) || $form->dberror($query);
         $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
-                   transdate, cleared, fx_transaction, project_id)
+                   transdate, cleared, fx_transaction, taxkey, project_id)
                    VALUES ($form->{id},
                           (SELECT c.id FROM chart c
-                           WHERE c.accno = '$accno'),
-                   $form->{fx}{$accno}{$transdate}, '$transdate', '0', '1', ?)|;
-        do_query($form, $dbh, $query, $project_id);
+                           WHERE c.accno = ?),
+                   $form->{fx}{$accno}{$transdate}, '$transdate', '0', '1',
+                    (SELECT taxkey_id FROM chart WHERE accno = ?), ?)|;
+        do_query($form, $dbh, $query, $accno, $accno, $project_id);
       }
     }
   }