"Zahlung buchen" bei Kreditoren- und Debitorenrechnungen: Konten richtig zuordnen...

diff --git a/SL/AP.pm b/SL/AP.pm
index f6478d39dadf305024b3dc0489b116b35bb15c04..cb5f65b171862a2855b812202bb3a0f369ca1faa 100644 (file)
--- a/SL/AP.pm
+++ b/SL/AP.pm
@@ -516,7 +516,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 +526,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,20 +561,19 @@ 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 =
         qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, project_id) | .
         qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, ?)|;
                  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,
+      @values = ($form->{id}, $accno_ap, $amount,

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

diff --git a/SL/AR.pm b/SL/AR.pm
index 049229f558c91bb104eb07bbcc6b8b028241941c..ddd67b42923227c8c83aa41b87e8576f29de9dbb 100644 (file)
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -383,7 +383,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}) {


@@ -397,9 +397,11 @@ sub post_payment {
   }
 
   $form->{exchangerate} =
   }
 
   $form->{exchangerate} =

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

                               "buy");
 
                               "buy");
 

+  my ($accno_ar) = split(/--/, $form->{ARselected});
+

   # record payments and offsetting AR
   for my $i (1 .. $form->{paidaccounts}) {
 
   # record payments and offsetting AR
   for my $i (1 .. $form->{paidaccounts}) {
 


@@ -407,7 +409,7 @@ sub post_payment {
       my $project_id = conv_i($form->{"paid_project_id_$i"});
 
       my ($accno) = split /--/, $form->{"AR_paid_$i"};
       my $project_id = conv_i($form->{"paid_project_id_$i"});
 
       my ($accno) = split /--/, $form->{"AR_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"};
 


@@ -432,13 +434,13 @@ sub post_payment {
 
 
       $query = qq|DELETE FROM acc_trans WHERE trans_id=$form->{id} AND chart_id=(SELECT c.id FROM chart c
 
 
       $query = qq|DELETE FROM acc_trans WHERE trans_id=$form->{id} AND chart_id=(SELECT c.id FROM chart c

-                                      WHERE c.accno = '$form->{AR}') AND amount=$amount AND transdate='$form->{"datepaid_$i"}'|;
+                                      WHERE c.accno = '$accno_ar') AND amount=$amount AND transdate='$form->{"datepaid_$i"}'|;

       $dbh->do($query) || $form->dberror($query);
 
       $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
                   transdate, project_id)
                   VALUES ($form->{id}, (SELECT c.id FROM chart c
       $dbh->do($query) || $form->dberror($query);
 
       $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
                   transdate, project_id)
                   VALUES ($form->{id}, (SELECT c.id FROM chart c

-                                      WHERE c.accno = '$form->{AR}'),
+                                      WHERE c.accno = '$accno_ar'),

                   $amount, '$form->{"datepaid_$i"}', ?)|;
       do_query($form, $dbh, $query, $project_id);
 
                   $amount, '$form->{"datepaid_$i"}', ?)|;
       do_query($form, $dbh, $query, $project_id);
 

diff --git a/SL/Form.pm b/SL/Form.pm
index 90ac919ef01111f576236de03aac426947bb0cd8..b6e0d8365d1153e0fda6d58ebfb0e3f4dc0eefa9 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -1092,7 +1092,7 @@ sub get_exchangerate {
 
   unless ($transdate) {
     $main::lxdebug->leave_sub();
 
   unless ($transdate) {
     $main::lxdebug->leave_sub();

-    return "";
+    return 1;

   }
 
   my $query = qq|SELECT e.$fld FROM exchangerate e
   }
 
   my $query = qq|SELECT e.$fld FROM exchangerate e


@@ -1104,7 +1104,7 @@ sub get_exchangerate {
   my ($exchangerate) = $sth->fetchrow_array;
   $sth->finish;
 
   my ($exchangerate) = $sth->fetchrow_array;
   $sth->finish;
 

-  if ($exchangerate == 0) {
+  if (!$exchangerate) {

     $exchangerate = 1;
   }
 
     $exchangerate = 1;
   }