Merge branch 'master' of github.com:kivitendo/kivitendo-erp

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

diff --git a/SL/CP.pm b/SL/CP.pm
index f6c8c1a..18673c2 100644 (file)
--- a/SL/CP.pm
+++ b/SL/CP.pm
@@ -128,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();
@@ -240,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 =
@@ -260,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 =
@@ -286,20 +269,20 @@ sub process_payment {
 
       # add AR/AP
       $query =
-        qq|INSERT INTO acc_trans (trans_id, chart_id, transdate, amount) | .
-        qq|VALUES (?, ?, ?, ?)|;
+        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);
+               conv_date($form->{datepaid}), $amount * $ml, $id);
 
       # add payment
       $query =
         qq|INSERT INTO acc_trans (trans_id, chart_id, transdate, amount, | .
-        qq|                       source, memo) | .
-        qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, ?)|;
+        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});
+                    $form->{memo}, $paymentaccno);
       do_query($form, $dbh, $query, @values);
 
       # add exchangerate difference if currency ne defaultcurrency
@@ -310,11 +293,11 @@ sub process_payment {
         # exchangerate difference
         $query =
           qq|INSERT INTO acc_trans (trans_id, chart_id, transdate, amount, | .
-          qq|                       cleared, fx_transaction) | .
-          qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, ?)|;
+          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');
+                   '1', $paymentaccno);
         do_query($form, $dbh, $query, @values);
 
         # gain/loss
@@ -326,11 +309,11 @@ sub process_payment {
           my $accno_id = ($amount < 0) ? $fxgain_accno_id : $fxloss_accno_id;
           $query =
             qq|INSERT INTO acc_trans (trans_id, chart_id, transdate, | .
-            qq|                       amount, cleared, fx_transaction) | .
-            qq|VALUES (?, ?, ?, ?, ?, ?)|;
+            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');
+                     '1', $accno_id);
           do_query($form, $dbh, $query, @values);
         }
       }
@@ -360,23 +343,16 @@ sub process_payment {
       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
     }
   }
-
   my $rc;
-  if ($form->round_amount($paymentamount, 2) < 0) {
-               # Hier werden negativen Zahlungseingänge abgefangen
-               # Besser: in Oberfläche schon prüfen
-               # Zahlungsein- und ausgänge sind immer positiv
-    $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;