Anständig quoten.

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

diff --git a/SL/AP.pm b/SL/AP.pm
index f6478d39dadf305024b3dc0489b116b35bb15c04..3f1818bdc5c113dc815aa15125c742f7da7dc352 100644 (file)
--- a/SL/AP.pm
+++ b/SL/AP.pm
@@ -90,7 +90,7 @@ sub post_transaction {
   $form->{taxincluded} = 0 if ($form->{amount} == 0);
 
   for $i (1 .. $form->{rowcount}) {
   $form->{taxincluded} = 0 if ($form->{amount} == 0);
 
   for $i (1 .. $form->{rowcount}) {

-   ($form->{"tax_id_$i"}, $NULL) = split /--/, $form->{"taxchart_$i"};
+    ($form->{"tax_id_$i"}, $NULL) = split /--/, $form->{"taxchart_$i"};

 
     $query =
       qq|SELECT c.accno, t.taxkey, t.rate | .
 
     $query =
       qq|SELECT c.accno, t.taxkey, t.rate | .


@@ -205,7 +205,7 @@ sub post_transaction {
               WHERE id = ?|;
   my @values = ($form->{invnumber}, conv_date($form->{transdate}),
                 $form->{ordnumber}, conv_i($form->{vendor_id}),
               WHERE id = ?|;
   my @values = ($form->{invnumber}, conv_date($form->{transdate}),
                 $form->{ordnumber}, conv_i($form->{vendor_id}),

-                $form->{taxincluded}, $form->{invtotal},
+                $form->{taxincluded} ? 't' : 'f', $form->{invtotal},

                 conv_date($form->{duedate}), $form->{invpaid},
                 conv_date($datepaid), $form->{netamount},
                 $form->{currency}, $form->{notes},
                 conv_date($form->{duedate}), $form->{invpaid},
                 conv_date($datepaid), $form->{netamount},
                 $form->{currency}, $form->{notes},


@@ -254,10 +254,11 @@ sub post_transaction {
 
   # add payables
   $query =
 
   # add payables
   $query =

-    qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate) | .
-    qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?)|;
+    qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey) | .
+    qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, | .
+    qq|        (SELECT taxkey_id FROM chart WHERE accno = ?))|;

   @values = ($form->{id}, $form->{AP_amounts}{payables}, $form->{payables},
   @values = ($form->{id}, $form->{AP_amounts}{payables}, $form->{payables},

-             conv_date($form->{transdate}));
+             conv_date($form->{transdate}), $form->{AP_amounts}{payables});

   do_query($form, $dbh, $query, @values);
 
   # if there is no amount but a payment record a payable
   do_query($form, $dbh, $query, @values);
 
   # if there is no amount but a payment record a payable


@@ -268,6 +269,7 @@ sub post_transaction {
   # add paid transactions
   for my $i (1 .. $form->{paidaccounts}) {
     if ($form->{"paid_$i"} != 0) {
   # add paid transactions
   for my $i (1 .. $form->{paidaccounts}) {
     if ($form->{"paid_$i"} != 0) {

+      my $project_id = conv_i($form->{"paid_project_id_$i"});

 
       $exchangerate = 0;
       if ($form->{currency} eq $form->{defaultcurrency}) {
 
       $exchangerate = 0;
       if ($form->{currency} eq $form->{defaultcurrency}) {


@@ -300,21 +302,24 @@ sub post_transaction {
                             2);
       if ($form->{payables}) {
         $query =
                             2);
       if ($form->{payables}) {
         $query =

-          qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate) | .
-          qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?)|;
+          qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, project_id, taxkey) | .
+          qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, | .
+          qq|        (SELECT taxkey_id FROM chart WHERE accno = ?))|;

         @values = ($form->{id}, $form->{AP}{payables}, $amount,
         @values = ($form->{id}, $form->{AP}{payables}, $amount,

-                   conv_date($form->{"datepaid_$i"}));
+                   conv_date($form->{"datepaid_$i"}), $project_id,
+                   $form->{AP}{payables});

         do_query($form, $dbh, $query, @values);
       }
       $form->{payables} = $amount;
 
       # add payment
       $query =
         do_query($form, $dbh, $query, @values);
       }
       $form->{payables} = $amount;
 
       # add payment
       $query =

-        qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, source, memo) | .
-        qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, ?, ?)|;
+        qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, source, memo, project_id, taxkey) | .
+        qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, ?, ?, | .
+        qq|        (SELECT taxkey_id FROM chart WHERE accno = ?))|;

       @values = ($form->{id}, $form->{AP}{"paid_$i"}, $form->{"paid_$i"},
                  conv_date($form->{"datepaid_$i"}), $form->{"source_$i"},
       @values = ($form->{id}, $form->{AP}{"paid_$i"}, $form->{"paid_$i"},
                  conv_date($form->{"datepaid_$i"}), $form->{"source_$i"},

-                 $form->{"memo_$i"});
+                 $form->{"memo_$i"}, $project_id, $form->{AP}{"paid_$i"});

       do_query($form, $dbh, $query, @values);
 
       # add exchange rate difference
       do_query($form, $dbh, $query, @values);
 
       # add exchange rate difference


@@ -323,10 +328,12 @@ sub post_transaction {
                             ($form->{"exchangerate_$i"} - 1), 2);
       if ($amount != 0) {
         $query =
                             ($form->{"exchangerate_$i"} - 1), 2);
       if ($amount != 0) {
         $query =

-          qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, fx_transaction, cleared) | .
-          qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, 't', 'f')|;
+          qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, fx_transaction, cleared, project_id, taxkey) | .
+          qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, 't', 'f', ?, | .
+          qq|        (SELECT taxkey_id FROM chart WHERE accno = ?))|;

         @values = ($form->{id}, $form->{AP}{"paid_$i"}, $amount,
         @values = ($form->{id}, $form->{AP}{"paid_$i"}, $amount,

-                   conv_date($form->{"datepaid_$i"}));
+                   conv_date($form->{"datepaid_$i"}), $project_id,
+                   $form->{AP}{"paid_$i"});

         do_query($form, $dbh, $query, @values);
       }
 
         do_query($form, $dbh, $query, @values);
       }
 


@@ -338,11 +345,14 @@ sub post_transaction {
 
       if ($amount != 0) {
         $query =
 
       if ($amount != 0) {
         $query =

-          qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, fx_transaction, cleared) | .
-          qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, 't', 'f')|;
+          qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, fx_transaction, cleared, project_id, taxkey) | .
+          qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, 't', 'f', ?, | .
+          qq|        (SELECT taxkey_id FROM chart WHERE accno = ?))|;

         @values = ($form->{id}, ($amount > 0) ?
                    $form->{fxgain_accno} : $form->{fxloss_accno},
         @values = ($form->{id}, ($amount > 0) ?
                    $form->{fxgain_accno} : $form->{fxloss_accno},

-                   $amount, conv_date($form->{"datepaid_$i"}));
+                   $amount, conv_date($form->{"datepaid_$i"}), $project_id,
+                   ($amount > 0) ?
+                   $form->{fxgain_accno} : $form->{fxloss_accno});

         do_query($form, $dbh, $query, @values);
       }
 
         do_query($form, $dbh, $query, @values);
       }
 


@@ -405,7 +415,7 @@ sub ap_transactions {
     qq|LEFT JOIN employee e ON (a.employee_id = e.id) | .
     qq|LEFT JOIN project pr ON (a.globalproject_id = pr.id) |;
 
     qq|LEFT JOIN employee e ON (a.employee_id = e.id) | .
     qq|LEFT JOIN project pr ON (a.globalproject_id = pr.id) |;
 

-  my $where;
+  my $where = qq| WHERE storno != true |;

   my @values;
 
   if ($form->{vendor_id}) {
   my @values;
 
   if ($form->{vendor_id}) {


@@ -456,7 +466,7 @@ sub ap_transactions {
   }
 
   if ($where) {
   }
 
   if ($where) {

-    substr($where, 0, 4) = "WHERE";
+#     substr($where, 0, 4) = "WHERE";

     $query .= $where;
   }
 
     $query .= $where;
   }
 


@@ -516,7 +526,7 @@ sub post_payment {
   # connect to database, turn off autocommit
   my $dbh = $form->dbconnect_noauto($myconfig);
 
   # connect to database, turn off autocommit
   my $dbh = $form->dbconnect_noauto($myconfig);
 

-  $form->{datepaid} = $form->{invdate};
+  $form->{datepaid} = $form->{transdate};

 
   # total payments, don't move we need it here
   for my $i (1 .. $form->{paidaccounts}) {
 
   # total payments, don't move we need it here
   for my $i (1 .. $form->{paidaccounts}) {


@@ -526,17 +536,19 @@ sub post_payment {
   }
 
   $form->{exchangerate} =
   }
 
   $form->{exchangerate} =

-      $form->get_exchangerate($dbh, $form->{currency}, $form->{invdate},
+      $form->get_exchangerate($dbh, $form->{currency}, $form->{transdate},

                               "buy");
 
   my (@values, $query);
 
                               "buy");
 
   my (@values, $query);
 

+  my ($accno_ap) = split(/--/, $form->{APselected});
+

   # record payments and offsetting AP
   for my $i (1 .. $form->{paidaccounts}) {
 
     if ($form->{"paid_$i"} != 0) {
       my ($accno) = split /--/, $form->{"AP_paid_$i"};
   # record payments and offsetting AP
   for my $i (1 .. $form->{paidaccounts}) {
 
     if ($form->{"paid_$i"} != 0) {
       my ($accno) = split /--/, $form->{"AP_paid_$i"};

-      $form->{"datepaid_$i"} = $form->{invdate}
+      $form->{"datepaid_$i"} = $form->{transdate}

         unless ($form->{"datepaid_$i"});
       $form->{datepaid} = $form->{"datepaid_$i"};
 
         unless ($form->{"datepaid_$i"});
       $form->{datepaid} = $form->{"datepaid_$i"};
 


@@ -559,22 +571,22 @@ sub post_payment {
         $form->round_amount($form->{"paid_$i"} * $form->{"exchangerate"},
                             2) * -1;
 
         $form->round_amount($form->{"paid_$i"} * $form->{"exchangerate"},
                             2) * -1;
 

-

       $query =
         qq|DELETE FROM acc_trans | .
         qq|WHERE trans_id = ? | .
         qq|  AND chart_id = (SELECT c.id FROM chart c WHERE c.accno = ?) | .
         qq|  AND amount = ? AND transdate = ?|;
       $query =
         qq|DELETE FROM acc_trans | .
         qq|WHERE trans_id = ? | .
         qq|  AND chart_id = (SELECT c.id FROM chart c WHERE c.accno = ?) | .
         qq|  AND amount = ? AND transdate = ?|;

-      @values = ($form->{id}, $form->{AP}, $amount,
+      @values = ($form->{id}, $accno_ap, $amount,

                  conv_date($form->{"datepaid_$i"}));
       do_query($form, $dbh, $query, @values);
 
       $query =
                  conv_date($form->{"datepaid_$i"}));
       do_query($form, $dbh, $query, @values);
 
       $query =

-        qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, project_id) | .
-        qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, ?)|;
-      @values = ($form->{id}, $form->{AP}, $amount,
+        qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, project_id, taxkey) | .
+        qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, | .
+        qq|        (SELECT taxkey_id FROM chart WHERE accno = ?))|;
+      @values = ($form->{id}, $accno_ap, $amount,

                  conv_date($form->{"datepaid_$i"}),
                  conv_date($form->{"datepaid_$i"}),

-                 conv_i($form->{"paid_project_id_$i"}));
+                 conv_i($form->{"paid_project_id_$i"}), $accno_ap);

       do_query($form, $dbh, $query, @values);
 
       $query =
       do_query($form, $dbh, $query, @values);
 
       $query =


@@ -588,12 +600,13 @@ sub post_payment {
       do_query($form, $dbh, $query, @values);
 
       $query =
       do_query($form, $dbh, $query, @values);
 
       $query =

-        qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, source, memo, project_id) | .
-        qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, ?, ?, ?)|;
+        qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, source, memo, project_id, taxkey) | .
+        qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, ?, ?, | .
+        qq|        (SELECT taxkey_id FROM chart WHERE accno = ?))|;

       @values = ($form->{id}, $accno, $form->{"paid_$i"},
                  $form->{"datepaid_$i"},
                  $form->{"source_$i"}, $form->{"memo_$i"},
       @values = ($form->{id}, $accno, $form->{"paid_$i"},
                  $form->{"datepaid_$i"},
                  $form->{"source_$i"}, $form->{"memo_$i"},

-                 conv_i($form->{"paid_project_id_$i"}));
+                 conv_i($form->{"paid_project_id_$i"}), $accno);

       do_query($form, $dbh, $query, @values);
 
       # gain/loss
       do_query($form, $dbh, $query, @values);
 
       # gain/loss


@@ -637,10 +650,11 @@ sub post_payment {
         do_query($form, $dbh, $query, @values);
 
         $query =
         do_query($form, $dbh, $query, @values);
 
         $query =

-          qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, cleared, fx_transaction) | .
-          qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, 'f', 't')|;
+          qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, cleared, fx_transaction, taxkey) | .
+          qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, 'f', 't', | .
+          qq|        (SELECT taxkey_id FROM chart WHERE accno = ?))|;

         @values = ($form->{id}, $accno, $form->{fx}{$accno}{$transdate},
         @values = ($form->{id}, $accno, $form->{fx}{$accno}{$transdate},

-                   conv_date($transdate));
+                   conv_date($transdate), $accno);

         do_query($form, $dbh, $query, @values);
       }
     }
         do_query($form, $dbh, $query, @values);
       }
     }