BUG-Fix: Beim Stornieren einer Rechnungen wird der bezahlte Betrag verdoppelt.

[mfinanz.git] / SL / CP.pm

diff --git a/SL/CP.pm b/SL/CP.pm
index b411b0608c947ee31bfb251b95d78c84a69222b3..3a2952728e30ef2f4dd23a32c77e4b0f134d970c 100644 (file)
--- a/SL/CP.pm
+++ b/SL/CP.pm
@@ -35,13 +35,16 @@
 #======================================================================
 
 package CP;
 #======================================================================
 
 package CP;

+use SL::DBUtils;
+
+use strict;

 
 sub new {
   $main::lxdebug->enter_sub();
 
   my ($type, $countrycode) = @_;
 
 
 sub new {
   $main::lxdebug->enter_sub();
 
   my ($type, $countrycode) = @_;
 

-  $self = {};
+  my $self = {};

 
   if ($countrycode) {
     if (-f "locale/$countrycode/Num2text") {
 
   if ($countrycode) {
     if (-f "locale/$countrycode/Num2text") {


@@ -66,36 +69,33 @@ sub paymentaccounts {
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 

-  my $query = qq|SELECT c.accno, c.description, c.link
-                 FROM chart c
-                WHERE c.link LIKE '%$form->{ARAP}%'
-                ORDER BY c.accno|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
+  my $ARAP = $form->{ARAP} eq "AR" ? "AR" : "AP";
+
+  my $query =
+    qq|SELECT accno, description, link | .
+    qq|FROM chart | .
+    qq|WHERE link LIKE ? |.
+    qq|ORDER BY accno|;
+  my $sth = prepare_execute_query($form, $dbh, $query, like($ARAP));

 
   $form->{PR}{ $form->{ARAP} } = ();
   $form->{PR}{"$form->{ARAP}_paid"} = ();
 
 
   $form->{PR}{ $form->{ARAP} } = ();
   $form->{PR}{"$form->{ARAP}_paid"} = ();
 

-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    foreach my $item (split /:/, $ref->{link}) {
+  while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
+    foreach my $item (split(/:/, $ref->{link})) {

       if ($item eq $form->{ARAP}) {
       if ($item eq $form->{ARAP}) {

-        push @{ $form->{PR}{ $form->{ARAP} } }, $ref;
+        push(@{ $form->{PR}{ $form->{ARAP} } }, $ref);

       }
       if ($item eq "$form->{ARAP}_paid") {
       }
       if ($item eq "$form->{ARAP}_paid") {

-        push @{ $form->{PR}{"$form->{ARAP}_paid"} }, $ref;
+        push(@{ $form->{PR}{"$form->{ARAP}_paid"} }, $ref);

       }
     }
   }
   $sth->finish;
 
       }
     }
   }
   $sth->finish;
 

-  # get currencies and closedto
-  $query = qq|SELECT curr, closedto
-              FROM defaults|;
-  $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  ($form->{currencies}, $form->{closedto}) = $sth->fetchrow_array;
-  $sth->finish;
+  # get closedto
+  $query = qq|SELECT closedto FROM defaults|;
+  ($form->{closedto}) = selectrow_query($form, $dbh, $query);

 
   $dbh->disconnect;
 
 
   $dbh->disconnect;
 


@@ -109,54 +109,27 @@ sub get_openvc {
 
   my $dbh = $form->dbconnect($myconfig);
 
 
   my $dbh = $form->dbconnect($myconfig);
 

-  my $arap  = ($form->{vc} eq 'customer') ? 'ar' : 'ap';
-  my $query = qq|SELECT count(*)
-                 FROM $form->{vc} ct, $arap a
-                WHERE a.$form->{vc}_id = ct.id
-                 AND a.amount != a.paid|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-  my ($count) = $sth->fetchrow_array;
-  $sth->finish;
-
-  my $ref;
+  my $arap = ($form->{vc} eq 'customer') ? 'ar' : 'ap';
+  my $vc = $form->{vc} eq "customer" ? "customer" : "vendor";
+  my $query =
+    qq|SELECT count(*) | .
+    qq|FROM $vc ct, $arap a | .
+    qq|WHERE (a.${vc}_id = ct.id) AND (a.amount != a.paid)|;
+  my ($count) = selectrow_query($form, $dbh, $query);

 
   # build selection list
   if ($count < $myconfig->{vclimit}) {
 
   # build selection list
   if ($count < $myconfig->{vclimit}) {

-    $query = qq|SELECT DISTINCT ct.id, ct.name
-                FROM $form->{vc} ct, $arap a
-               WHERE a.$form->{vc}_id = ct.id
-               AND a.amount != a.paid
-               ORDER BY ct.name|;
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
-
-    while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
-      push @{ $form->{"all_$form->{vc}"} }, $ref;
-    }
-
-    $sth->finish;
-
-  }
-
-  if ($form->{ARAP} eq 'AR') {
-    $query = qq|SELECT d.id, d.description
-                FROM department d
-               WHERE d.role = 'P'
-               ORDER BY 2|;
-  } else {
-    $query = qq|SELECT d.id, d.description
-                FROM department d
-               ORDER BY 2|;
+    $query =
+      qq|SELECT DISTINCT ct.id, ct.name | .
+      qq|FROM $vc ct, $arap a | .
+      qq|WHERE (a.${vc}_id = ct.id) AND (a.amount != a.paid) | .
+      qq|ORDER BY ct.name|;
+    $form->{"all_$form->{vc}"} = selectall_hashref_query($form, $dbh, $query);

   }
   }

-  $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
-    push @{ $form->{all_departments} }, $ref;
-  }
-  $sth->finish;

 
 

+  # aufruf für all_deparments rausgenommen, da die abteilungen nur
+  # beim buchen der belege (rechnung, fibu) geändert werden und danach
+  # NICHT mehr überschrieben werden

   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();


@@ -170,26 +143,30 @@ sub get_openinvoices {
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 

-  my $where = qq|WHERE a.$form->{vc}_id = $form->{"$form->{vc}_id"}
-                 AND a.curr = '$form->{currency}'
-                AND NOT a.amount = paid|;
+  my $vc = $form->{vc} eq "customer" ? "customer" : "vendor";

 
 

-  my ($buysell);
-  if ($form->{vc} eq 'customer') {
-    $buysell = "buy";
-  } else {
-    $buysell = "sell";
+  my $buysell = $form->{vc} eq 'customer' ? "buy" : "sell";
+  my $arap = $form->{arap} eq "ar" ? "ar" : "ap";
+
+  my @values = (conv_i($form->{"${vc}_id"}), "$form->{currency}");
+  my $whereinvoice = '';
+  if ($::form->{invnumber}) {
+    $whereinvoice = ' AND a.invnumber LIKE ? ';
+    push @values, $::form->{invnumber};

   }
 
   my $query =
   }
 
   my $query =

-    qq|SELECT a.id, a.invnumber, a.transdate, a.amount, a.paid, a.curr
-                FROM $form->{arap} a
-                $where
-                ORDER BY a.id|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
+     qq|SELECT a.id, a.invnumber, a.transdate, a.amount, a.paid, cu.name AS curr | .
+     qq|FROM $arap a | .
+     qq|LEFT JOIN currencies cu ON (cu.id=a.currency_id)| .
+     qq|WHERE (a.${vc}_id = ?) AND cu.name = ? AND NOT (a.amount = a.paid)| .
+     $whereinvoice .
+     qq|ORDER BY a.id|;

 
 

-  while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+  my $sth = prepare_execute_query($form, $dbh, $query, @values);
+
+  $form->{PR} = [];
+  while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {

 
     # if this is a foreign currency transaction get exchangerate
     $ref->{exchangerate} =
 
     # if this is a foreign currency transaction get exchangerate
     $ref->{exchangerate} =


@@ -199,6 +176,16 @@ sub get_openinvoices {
   }
 
   $sth->finish;
   }
 
   $sth->finish;

+
+  $query = <<SQL;
+    SELECT COUNT(*)
+    FROM $arap
+    WHERE (${vc}_id = ?)
+      AND ((SELECT cu.name FROM currencies cu WHERE cu.id=${arap}.currency_id) <> ?)
+      AND (amount <> paid)
+SQL
+  ($form->{openinvoices_other_currencies}) = selectfirst_array_query($form, $dbh, $query, conv_i($form->{"${vc}_id"}), "$form->{currency}");
+

   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();


@@ -208,6 +195,7 @@ sub process_payment {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form) = @_;

+  my $amount;

 
   # connect to database, turn AutoCommit off
   my $dbh = $form->dbconnect_noauto($myconfig);
 
   # connect to database, turn AutoCommit off
   my $dbh = $form->dbconnect_noauto($myconfig);


@@ -220,62 +208,41 @@ sub process_payment {
       $form->parse_amount($myconfig, $form->{exchangerate});
 
     if ($form->{vc} eq 'customer') {
       $form->parse_amount($myconfig, $form->{exchangerate});
 
     if ($form->{vc} eq 'customer') {

-      $form->update_exchangerate($dbh, $form->{currency}, $form->{datepaid},
-                                 $form->{exchangerate}, 0);
+      $form->update_exchangerate($dbh, $form->{currency}, $form->{datepaid}, $form->{exchangerate}, 0);

     } else {
     } else {

-      $form->update_exchangerate($dbh, $form->{currency}, $form->{datepaid}, 0,
-                                 $form->{exchangerate});
+      $form->update_exchangerate($dbh, $form->{currency}, $form->{datepaid}, 0, $form->{exchangerate});

     }
   } else {
     $form->{exchangerate} = 1;
   }
 
     }
   } else {
     $form->{exchangerate} = 1;
   }
 

-  my $query = qq|SELECT fxgain_accno_id, fxloss_accno_id
-                 FROM defaults|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  my ($fxgain_accno_id, $fxloss_accno_id) = $sth->fetchrow_array;
-  $sth->finish;
-
-  my ($buysell);
+  my $query = qq|SELECT fxgain_accno_id, fxloss_accno_id FROM defaults|;
+  my ($fxgain_accno_id, $fxloss_accno_id) = selectrow_query($form, $dbh, $query);

 
 

-  if ($form->{vc} eq 'customer') {
-    $buysell = "buy";
-  } else {
-    $buysell = "sell";
-  }
+  my $buysell = $form->{vc} eq "customer" ? "buy" : "sell";
+  my $arap = $form->{arap} eq "ar" ? "ar" : "ap";

 
   my $ml;
   my $where;
 
   if ($form->{ARAP} eq 'AR') {
     $ml    = 1;
 
   my $ml;
   my $where;
 
   if ($form->{ARAP} eq 'AR') {
     $ml    = 1;

-    $where = qq|
-               (c.link = 'AR'
-               OR c.link LIKE 'AR:%')
-               |;
+    $where = qq| ((c.link = 'AR') OR (c.link LIKE 'AR:%')) |;

   } else {
     $ml    = -1;
   } else {
     $ml    = -1;

-    $where = qq|
-                (c.link = 'AP'
-                OR c.link LIKE '%:AP'
-               OR c.link LIKE '%:AP:%')
-               |;
+    $where =
+      qq| ((c.link = 'AP') OR | .
+      qq|  (c.link LIKE '%:AP') OR | .
+      qq|  (c.link LIKE '%:AP:%')) |;

   }
 
   }
 

-  $paymentamount = $form->{amount};
-
-  #  $paymentamount = $form->{amount};
-  my $null;
-  ($null, $form->{department_id}) = split /--/, $form->{department};
-  $form->{department_id} *= 1;

 
   # query to retrieve paid amount
 
   # query to retrieve paid amount

-  $query = qq|SELECT a.paid FROM ar a
-              WHERE a.id = ?
-             FOR UPDATE|;
-  my $pth = $dbh->prepare($query) || $form->dberror($query);
+  $query =
+    qq|SELECT a.paid FROM ar a | .
+    qq|WHERE a.id = ? | .
+    qq|FOR UPDATE|;
+  my $pth = prepare_query($form, $dbh, $query);

 
   # go through line by line
   for my $i (1 .. $form->{rowcount}) {
 
   # go through line by line
   for my $i (1 .. $form->{rowcount}) {


@@ -284,93 +251,89 @@ sub process_payment {
     $form->{"due_$i"}  = $form->parse_amount($myconfig, $form->{"due_$i"});
 
     if ($form->{"checked_$i"} && $form->{"paid_$i"}) {
     $form->{"due_$i"}  = $form->parse_amount($myconfig, $form->{"due_$i"});
 
     if ($form->{"checked_$i"} && $form->{"paid_$i"}) {

-      $paymentamount =
-        (($paymentamount * 1000) - ($form->{"paid_$i"} * 1000)) / 1000;

 
       # get exchangerate for original
 
       # get exchangerate for original

-      $query = qq|SELECT $buysell
-                  FROM exchangerate e
-                  JOIN $form->{arap} a ON (a.transdate = e.transdate)
-                 WHERE e.curr = '$form->{currency}'
-                 AND a.id = $form->{"id_$i"}|;
-      $sth = $dbh->prepare($query);
-      $sth->execute || $form->dberror($query);
-
-      my ($exchangerate) = $sth->fetchrow_array;
-      $sth->finish;
+      $query =
+        qq|SELECT $buysell | .
+        qq|FROM exchangerate e | .
+        qq|JOIN ${arap} a ON (a.transdate = e.transdate) | .
+        qq|WHERE (e.currency_id = (SELECT id FROM currencies WHERE name = ?)) AND (a.id = ?)|;
+      my ($exchangerate) =
+        selectrow_query($form, $dbh, $query,
+                        $form->{currency}, $form->{"id_$i"});

 
       $exchangerate = 1 unless $exchangerate;
 
 
       $exchangerate = 1 unless $exchangerate;
 

-      $query = qq|SELECT c.id
-                  FROM chart c
-                 JOIN acc_trans a ON (a.chart_id = c.id)
-                 WHERE $where
-                 AND a.trans_id = $form->{"id_$i"}|;
-      $sth = $dbh->prepare($query);
-      $sth->execute || $form->dberror($query);
-
-      my ($id) = $sth->fetchrow_array;
-      $sth->finish;
+      $query =
+        qq|SELECT c.id | .
+        qq|FROM chart c | .
+        qq|JOIN acc_trans a ON (a.chart_id = c.id) | .
+        qq|WHERE $where | .
+        qq|AND (a.trans_id = ?)|;
+      my ($id) = selectrow_query($form, $dbh, $query, $form->{"id_$i"});

 
       $amount = $form->round_amount($form->{"paid_$i"} * $exchangerate, 2);
 
       # add AR/AP
 
       $amount = $form->round_amount($form->{"paid_$i"} * $exchangerate, 2);
 
       # add AR/AP

-      $query = qq|INSERT INTO acc_trans (trans_id, chart_id, transdate,
-                  amount)
-                  VALUES ($form->{"id_$i"}, $id, '$form->{datepaid}',
-                 $amount * $ml)|;
-      $dbh->do($query) || $form->dberror($query);
+      $query =
+        qq|INSERT INTO acc_trans (trans_id, chart_id, transdate, amount, chart_link, taxkey, tax_id) | .
+        qq|VALUES (?, ?, ?, ?, (SELECT link FROM chart WHERE id=?), 0, (SELECT id FROM tax WHERE taxkey=0 LIMIT 1))|;
+      do_query($form, $dbh, $query, $form->{"id_$i"}, $id,
+               conv_date($form->{datepaid}), $amount * $ml, $id);

 
       # add payment
 
       # add payment

-      $query = qq|INSERT INTO acc_trans (trans_id, chart_id, transdate,
-                  amount, source, memo)
-                  VALUES ($form->{"id_$i"},
-                        (SELECT c.id FROM chart c
-                         WHERE c.accno = '$paymentaccno'),
-                 '$form->{datepaid}', $form->{"paid_$i"} * $ml * -1,
-                 '$form->{source}', '$form->{memo}')|;
-      $dbh->do($query) || $form->dberror($query);
+      $query =
+        qq|INSERT INTO acc_trans (trans_id, chart_id, transdate, amount, | .
+        qq|                       source, memo, chart_link, taxkey, tax_id) | .
+        qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, ?, (SELECT link FROM chart WHERE accno=?), 0, (SELECT id FROM tax WHERE taxkey=0 LIMIT 1))|;
+      my @values = (conv_i($form->{"id_$i"}), $paymentaccno,
+                    conv_date($form->{datepaid}),
+                    $form->{"paid_$i"} * $ml * -1, $form->{source},
+                    $form->{memo}, $paymentaccno);
+      do_query($form, $dbh, $query, @values);

 
       # add exchangerate difference if currency ne defaultcurrency
 
       # add exchangerate difference if currency ne defaultcurrency

-      $amount =
-        $form->round_amount($form->{"paid_$i"} * ($form->{exchangerate} - 1),
+      $amount = $form->round_amount($form->{"paid_$i"} * ($form->{exchangerate} - 1),

                             2);
       if ($amount != 0) {
 
         # exchangerate difference
                             2);
       if ($amount != 0) {
 
         # exchangerate difference

-        $query = qq|INSERT INTO acc_trans (trans_id, chart_id, transdate,
-                   amount, cleared, fx_transaction)
-                   VALUES ($form->{"id_$i"},
-                          (SELECT c.id FROM chart c
-                           WHERE c.accno = '$paymentaccno'),
-                 '$form->{datepaid}', $amount * $ml * -1, '0', '1')|;
-        $dbh->do($query) || $form->dberror($query);
+        $query =
+          qq|INSERT INTO acc_trans (trans_id, chart_id, transdate, amount, | .
+          qq|                       cleared, fx_transaction, chart_link, taxkey, tax_id) | .
+          qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, ?, (SELECT link FROM chart WHERE accno = ?), 0, (SELECT id FROM tax WHERE taxkey=0 LIMIT 1))|;
+        @values = (conv_i($form->{"id_$i"}), $paymentaccno,
+                   conv_date($form->{datepaid}), ($amount * $ml * -1), '0',
+                   '1', $paymentaccno);
+        do_query($form, $dbh, $query, @values);

 
         # gain/loss
 
         $amount =
 
         # gain/loss
 
         $amount =

-          $form->round_amount(
-                  $form->{"paid_$i"} * ($exchangerate - $form->{exchangerate}),
-                  2);
+          $form->round_amount($form->{"paid_$i"} *
+                              ($exchangerate - $form->{exchangerate}), 2);

         if ($amount != 0) {
           my $accno_id = ($amount < 0) ? $fxgain_accno_id : $fxloss_accno_id;
         if ($amount != 0) {
           my $accno_id = ($amount < 0) ? $fxgain_accno_id : $fxloss_accno_id;

-          $query = qq|INSERT INTO acc_trans (trans_id, chart_id, transdate,
-                     amount, cleared, fx_transaction)
-                     VALUES ($form->{"id_$i"}, $accno_id,
-                     '$form->{datepaid}', $amount * $ml * -1, '0', '1')|;
-          $dbh->do($query) || $form->dberror($query);
+          $query =
+            qq|INSERT INTO acc_trans (trans_id, chart_id, transdate, | .
+            qq|                       amount, cleared, fx_transaction, chart_link, taxkey, tax_id) | .
+            qq|VALUES (?, ?, ?, ?, ?, ?, (SELECT link FROM chart WHERE id=?), 0, (SELECT id FROM tax WHERE taxkey=0 LIMIT 1))|;
+          @values = (conv_i($form->{"id_$i"}), $accno_id,
+                     conv_date($form->{datepaid}), $amount * $ml * -1, '0',
+                     '1', $accno_id);
+          do_query($form, $dbh, $query, @values);

         }
       }
 
       $form->{"paid_$i"} =
         $form->round_amount($form->{"paid_$i"} * $exchangerate, 2);
         }
       }
 
       $form->{"paid_$i"} =
         $form->round_amount($form->{"paid_$i"} * $exchangerate, 2);

-

       $pth->execute($form->{"id_$i"}) || $form->dberror;
       ($amount) = $pth->fetchrow_array;
       $pth->finish;
 
       $amount += $form->{"paid_$i"};
       $pth->execute($form->{"id_$i"}) || $form->dberror;
       ($amount) = $pth->fetchrow_array;
       $pth->finish;
 
       $amount += $form->{"paid_$i"};

-      
+
+      my $paid;

       # BUG 324
       if ($form->{arap} eq 'ap') {
         $paid = "paid = paid + $amount";
       # BUG 324
       if ($form->{arap} eq 'ap') {
         $paid = "paid = paid + $amount";


@@ -379,27 +342,25 @@ sub process_payment {
       }
 
       # update AR/AP transaction
       }
 
       # update AR/AP transaction

-      $query = qq|UPDATE $form->{arap} set
-      $paid,
-                 datepaid = '$form->{datepaid}'
-                 WHERE id = $form->{"id_$i"}|;
-      $dbh->do($query) || $form->dberror($query);
+      $query = qq|UPDATE $arap SET $paid, datepaid = ? WHERE id = ?|;
+      @values = (conv_date($form->{datepaid}), conv_i($form->{"id_$i"}));
+      do_query($form, $dbh, $query, @values);
+      # saving the history
+      $form->{id} = $form->{"id_$i"};
+      if(!exists $form->{addition}) {
+        $form->{snumbers}  = qq|invnumber_| . $form->{"invnumber_$i"};
+        $form->{what_done} = "invoice";
+        $form->{addition}  = "PAYMENT POSTED";
+        $form->save_history;
+      }
+      # /saving the history

     }
   }
     }
   }

-
-  # record a AR/AP with a payment
-  if ($form->round_amount($paymentamount, 2) > 0) {
-    $form->{invnumber} = "";
-    OP::overpayment("", $myconfig, $form, $dbh, $paymentamount, $ml, 1);
-  }
-
-  if ($form->round_amount($paymentamount, 2) < 0) {
-    $dbh->rollback;
-    $rc = 0;
-  }
-  if ($form->round_amount($paymentamount, 2) == 0) {
+  my $rc;
+  # Hier wurden negativen Zahlungseingänge abgefangen
+  # da Zahlungsein- und ausgänge immer positiv sind
+  # Besser: in Oberfläche schon prüfen erledigt jb 10.2010

     $rc = $dbh->commit;
     $rc = $dbh->commit;

-  }

 
   $dbh->disconnect;
 
 
   $dbh->disconnect;