use parent statt use base in MetaSetup

[mfinanz.git] / SL / CP.pm

diff --git a/SL/CP.pm b/SL/CP.pm
index e0cefd314045694208d55701dfccc719989480c6..a2a247613943f1a95c32c634aff0b9be82ef56ac 100644 (file)
--- a/SL/CP.pm
+++ b/SL/CP.pm
@@ -37,12 +37,14 @@
 package CP;
 use SL::DBUtils;
 
 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") {


@@ -79,7 +81,7 @@ sub paymentaccounts {
   $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)) {
+  while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {

     foreach my $item (split(/:/, $ref->{link})) {
       if ($item eq $form->{ARAP}) {
         push(@{ $form->{PR}{ $form->{ARAP} } }, $ref);
     foreach my $item (split(/:/, $ref->{link})) {
       if ($item eq $form->{ARAP}) {
         push(@{ $form->{PR}{ $form->{ARAP} } }, $ref);


@@ -91,10 +93,9 @@ sub paymentaccounts {
   }
   $sth->finish;
 
   }
   $sth->finish;
 

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

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


@@ -126,20 +127,9 @@ sub get_openvc {
     $form->{"all_$form->{vc}"} = selectall_hashref_query($form, $dbh, $query);
   }
 
     $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();
   $dbh->disconnect;
 
   $main::lxdebug->leave_sub();


@@ -158,17 +148,25 @@ sub get_openinvoices {
   my $buysell = $form->{vc} eq 'customer' ? "buy" : "sell";
   my $arap = $form->{arap} eq "ar" ? "ar" : "ap";
 
   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 | .
-          qq|FROM $arap a | .
-     qq|WHERE (a.${vc}_id = ?) AND (a.curr = ?) AND NOT (a.amount = paid)|;
-                qq|ORDER BY a.id|;
-  my $sth = prepare_execute_query($form, $dbh, $query,
-                                  conv_i($form->{"${vc}_id"}),
-                                  $form->{currency});
+     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|;
+
+  my $sth = prepare_execute_query($form, $dbh, $query, @values);

 
   $form->{PR} = [];
 
   $form->{PR} = [];

-  while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
+  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} =


@@ -178,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();


@@ -187,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);


@@ -199,20 +208,16 @@ 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 ($fxgain_accno_id, $fxloss_accno_id) =
-    selectrow_query($form, $dbh, $query);
+  my $query = qq|SELECT fxgain_accno_id, fxloss_accno_id FROM defaults|;
+  my ($fxgain_accno_id, $fxloss_accno_id) = selectrow_query($form, $dbh, $query);

 
   my $buysell = $form->{vc} eq "customer" ? "buy" : "sell";
   my $arap = $form->{arap} eq "ar" ? "ar" : "ap";
 
   my $buysell = $form->{vc} eq "customer" ? "buy" : "sell";
   my $arap = $form->{arap} eq "ar" ? "ar" : "ap";


@@ -231,12 +236,6 @@ sub process_payment {
       qq|  (c.link LIKE '%:AP:%')) |;
   }
 
       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 =
 
   # query to retrieve paid amount
   $query =


@@ -252,15 +251,13 @@ 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
       $query =
         qq|SELECT $buysell | .
         qq|FROM exchangerate e | .
         qq|JOIN ${arap} a ON (a.transdate = e.transdate) | .
 
       # get exchangerate for original
       $query =
         qq|SELECT $buysell | .
         qq|FROM exchangerate e | .
         qq|JOIN ${arap} a ON (a.transdate = e.transdate) | .

-        qq|WHERE (e.curr = ?) AND (a.id = ?)|;
+        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"});
       my ($exchangerate) =
         selectrow_query($form, $dbh, $query,
                         $form->{currency}, $form->{"id_$i"});


@@ -279,36 +276,35 @@ sub process_payment {
 
       # add AR/AP
       $query =
 
       # 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,
       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, | .
 
       # 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},
       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
       do_query($form, $dbh, $query, @values);
 
       # 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
         $query =
           qq|INSERT INTO acc_trans (trans_id, chart_id, transdate, amount, | .
                             2);
       if ($amount != 0) {
 
         # 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 = ?), ?, ?, ?, ?)|;
-                   @values = (conv_i($form->{"id_$i"}), $paymentaccno,
+          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',
                    conv_date($form->{datepaid}), ($amount * $ml * -1), '0',

-                   '1');
+                   '1', $paymentaccno);

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


@@ -320,11 +316,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, | .
           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',
           @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);
         }
       }
           do_query($form, $dbh, $query, @values);
         }
       }


@@ -337,6 +333,7 @@ sub process_payment {
 
       $amount += $form->{"paid_$i"};
 
 
       $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";


@@ -346,32 +343,24 @@ sub process_payment {
 
       # update AR/AP transaction
       $query = qq|UPDATE $arap SET $paid, datepaid = ? WHERE id = ?|;
 
       # 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}) {
       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->{snumbers}  = qq|invnumber_| . $form->{"invnumber_$i"};
+        $form->{what_done} = "invoice";
+        $form->{addition}  = "PAYMENT POSTED";
+        $form->save_history;

       }
       }

-      # /saving the 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;