Merge branch 'master' of vc.linet-services.de:public/lx-office-erp

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

diff --git a/SL/CP.pm b/SL/CP.pm
index cb97f96..5786bf8 100644 (file)
--- a/SL/CP.pm
+++ b/SL/CP.pm
@@ -37,6 +37,8 @@
 package CP;
 use SL::DBUtils;
 
+use strict;
+
 sub new {
   $main::lxdebug->enter_sub();
 
@@ -126,20 +128,9 @@ sub get_openvc {
     $form->{"all_$form->{vc}"} = selectall_hashref_query($form, $dbh, $query);
   }
 
-  if ($form->{ARAP} eq 'AR') {
-    $query =
-      qq|SELECT d.id, d.description | .
-      qq|FROM department d | .
-      qq|WHERE d.role = 'P' | .
-      qq|ORDER BY 2|;
-  } else {
-    $query =
-      qq|SELECT d.id, d.description | .
-      qq|FROM department d | .
-      qq|ORDER BY 2|;
-  }
-  $form->{all_departments} = selectall_hashref_query($form, $dbh, $query);
-
+  # 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();
@@ -158,16 +149,14 @@ sub get_openinvoices {
   my $buysell = $form->{vc} eq 'customer' ? "buy" : "sell";
   my $arap = $form->{arap} eq "ar" ? "ar" : "ap";
 
-  my $curr_null = $form->{curreny} ? '' : ' OR a.curr IS NULL'; # fix: after sql-injection fix, curr is inserted as NULL, before that as ''
-
   my $query =
      qq|SELECT a.id, a.invnumber, a.transdate, a.amount, a.paid, a.curr | .
-          qq|FROM $arap a | .
-     qq|WHERE (a.${vc}_id = ?) AND (a.curr = ? $curr_null) AND NOT (a.amount = paid)| .
-                qq|ORDER BY a.id|;
+     qq|FROM $arap a | .
+     qq|WHERE (a.${vc}_id = ?) AND (COALESCE(a.curr, '') = ?) AND NOT (a.amount = a.paid)| .
+     qq|ORDER BY a.id|;
   my $sth = prepare_execute_query($form, $dbh, $query,
                                   conv_i($form->{"${vc}_id"}),
-                                  $form->{currency});
+                                  "$form->{currency}");
 
   $form->{PR} = [];
   while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
@@ -180,6 +169,16 @@ sub get_openinvoices {
   }
 
   $sth->finish;
+
+  $query = <<SQL;
+    SELECT COUNT(*)
+    FROM $arap
+    WHERE (${vc}_id = ?)
+      AND (COALESCE(curr, '') <> ?)
+      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();
@@ -230,11 +229,6 @@ sub process_payment {
       qq|  (c.link LIKE '%:AP:%')) |;
   }
 
-  my $paymentamount = $form->{amount};
-
-  my $null;
-  ($null, $form->{department_id}) = split(/--/, $form->{department});
-  $form->{department_id} *= 1;
 
   # query to retrieve paid amount
   $query =
@@ -250,7 +244,6 @@ sub process_payment {
     $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
       $query =
@@ -302,7 +295,7 @@ sub process_payment {
           qq|INSERT INTO acc_trans (trans_id, chart_id, transdate, amount, | .
           qq|                       cleared, fx_transaction) | .
           qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, ?)|;
-                   @values = (conv_i($form->{"id_$i"}), $paymentaccno,
+        @values = (conv_i($form->{"id_$i"}), $paymentaccno,
                    conv_date($form->{datepaid}), ($amount * $ml * -1), '0',
                    '1');
         do_query($form, $dbh, $query, @values);
@@ -343,33 +336,23 @@ sub process_payment {
 
       # update AR/AP transaction
       $query = qq|UPDATE $arap SET $paid, datepaid = ? WHERE id = ?|;
-                 @values = (conv_date($form->{datepaid}), conv_i($form->{"id_$i"}));
+      @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->{addition} = "POSTED";
-        $form->save_history($form->dbconnect($myconfig));
+        $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);
-  }
-
   my $rc;
-  if ($form->round_amount($paymentamount, 2) < 0) {
-    $dbh->rollback;
-    $rc = 0;
-  }
-  if ($form->round_amount($paymentamount, 2) == 0) {
+  # 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;
-  }
 
   $dbh->disconnect;