X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAP.pm;h=44ddc110c7c64950c7d3a65eb9ab03ea20b504a3;hb=28b3276ca12390954e40f29ce91fe732f6183bfa;hp=e4ff230c2e8af13b449bb70581c3745d3a9d4ee8;hpb=1072cd08c6f5b1905a34dcb3eeab3ddec98d6905;p=kivitendo-erp.git

diff --git a/SL/AP.pm b/SL/AP.pm
index e4ff230c2..44ddc110c 100644
--- a/SL/AP.pm
+++ b/SL/AP.pm
@@ -34,10 +34,11 @@
 
 package AP;
 
+use SL::DATEV qw(:CONSTANTS);
 use SL::DBUtils;
 use SL::IO;
 use SL::MoreCommon;
-
+use SL::DB::Default;
 use Data::Dumper;
 
 use strict;
@@ -57,7 +58,6 @@ sub post_transaction {
   delete $form->{currency} unless $form->{defaultcurrency};
 
   ($null, $form->{department_id}) = split(/--/, $form->{department});
-  $form->{department_id} *= 1;
 
   if ($form->{currency} eq $form->{defaultcurrency}) {
     $form->{exchangerate} = 1;
@@ -185,7 +185,8 @@ sub post_transaction {
     $query = qq|UPDATE ap SET
                 invnumber = ?, transdate = ?, ordnumber = ?, vendor_id = ?, taxincluded = ?,
                 amount = ?, duedate = ?, paid = ?, netamount = ?,
-                curr = ?, notes = ?, department_id = ?, storno = ?, storno_id = ?
+                curr = ?, notes = ?, department_id = ?, storno = ?, storno_id = ?,
+                globalproject_id = ?
                WHERE id = ?|;
     @values = ($form->{invnumber}, conv_date($form->{transdate}),
                   $form->{ordnumber}, conv_i($form->{vendor_id}),
@@ -194,7 +195,8 @@ sub post_transaction {
                   $form->{netamount},
                   $form->{currency}, $form->{notes},
                   conv_i($form->{department_id}), $form->{storno},
-                  $form->{storno_id}, $form->{id});
+                  $form->{storno_id}, conv_i($form->{globalproject_id}),
+                  $form->{id});
     do_query($form, $dbh, $query, @values);
 
     # add individual transactions
@@ -247,6 +249,11 @@ sub post_transaction {
 
   # add paid transactions
   for my $i (1 .. $form->{paidaccounts}) {
+
+    if ($form->{"acc_trans_id_$i"} && $payments_only && (SL::DB::Default->get->payments_changeable == 0)) {
+      next;
+    }
+
     if ($form->{"paid_$i"} != 0) {
       my $project_id = conv_i($form->{"paid_project_id_$i"});
 
@@ -286,12 +293,13 @@ sub post_transaction {
       $form->{payables} = $amount;
 
       # add payment
+      my $gldate = (conv_date($form->{"gldate_$i"}))? conv_date($form->{"gldate_$i"}) : conv_date($form->current_date($myconfig));
       $query =
-        qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, source, memo, project_id, taxkey) | .
-        qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, ?, ?, | .
+        qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, gldate, source, memo, project_id, taxkey) | .
+        qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, ?, ?, ?, | .
         qq|        (SELECT taxkey_id FROM chart WHERE accno = ?))|;
       @values = ($form->{id}, $form->{"AP_paid_account_$i"}, $form->{"paid_$i"},
-                 conv_date($form->{"datepaid_$i"}), $form->{"source_$i"},
+                 conv_date($form->{"datepaid_$i"}), $gldate, $form->{"source_$i"},
                  $form->{"memo_$i"}, $project_id, $form->{"AP_paid_account_$i"});
       do_query($form, $dbh, $query, @values);
 
@@ -345,6 +353,27 @@ sub post_transaction {
 
   IO->set_datepaid(table => 'ap', id => $form->{id}, dbh => $dbh);
 
+  # safety check datev export
+  if ($::instance_conf->get_datev_check_on_ap_transaction) {
+    my $transdate = $::form->{transdate} ? DateTime->from_lxoffice($::form->{transdate}) : undef;
+    $transdate  ||= DateTime->today;
+
+    my $datev = SL::DATEV->new(
+      exporttype => DATEV_ET_BUCHUNGEN,
+      format     => DATEV_FORMAT_KNE,
+      dbh        => $dbh,
+      from       => $transdate,
+      to         => $transdate,
+    );
+
+    $datev->export;
+
+    if ($datev->errors) {
+      $dbh->rollback;
+      die join "\n", $::locale->text('DATEV check returned errors:'), $datev->errors;
+    }
+  }
+
   if (!$provided_dbh) {
     $dbh->commit();
     $dbh->disconnect();
@@ -365,13 +394,10 @@ sub delete_transaction {
   # connect to database
   my $dbh = $form->dbconnect_noauto($myconfig);
 
+  # acc_trans entries are deleted by database triggers.
   my $query = qq|DELETE FROM ap WHERE id = ?|;
   do_query($form, $dbh, $query, $form->{id});
 
-  $query = qq|DELETE FROM acc_trans WHERE trans_id = ?|;
-  do_query($form, $dbh, $query, $form->{id});
-
-  # commit and redirect
   my $rc = $dbh->commit;
   $dbh->disconnect;
 
@@ -422,9 +448,12 @@ sub ap_transactions {
     push(@values, $form->like($form->{vendor}));
   }
   if ($form->{department}) {
-    my ($null, $department_id) = split /--/, $form->{department};
+    # ähnlich wie commit 0bbfb33b6aa8e38bb6c81d1684ab7d08e5b5c5af abteilung
+    # wird so nicht mehr als zeichenkette zusammengebaut
+    # hätte zu ee9f9f9aa4c3b9d5d20ab10a45c12bcaa6aa78d0 auffallen können ;-) jan
+    #my ($null, $department_id) = split /--/, $form->{department};
     $where .= " AND a.department_id = ?";
-    push(@values, $department_id);
+    push(@values, $form->{department});
   }
   if ($form->{invnumber}) {
     $where .= " AND a.invnumber ILIKE ?";
@@ -442,8 +471,12 @@ sub ap_transactions {
     $where .=
       qq|AND ((a.globalproject_id = ?) OR EXISTS | .
       qq|  (SELECT * FROM invoice i | .
-      qq|   WHERE i.project_id = ? AND i.trans_id = a.id))|;
-    push(@values, $form->{project_id}, $form->{project_id});
+      qq|   WHERE i.project_id = ? AND i.trans_id = a.id) | .
+      qq| OR EXISTS | .
+      qq|  (SELECT * FROM acc_trans at | .
+      qq|   WHERE at.project_id = ? AND at.trans_id = a.id)| .
+      qq|  )|;
+    push(@values, $form->{project_id}, $form->{project_id}, $form->{project_id});
   }
 
   if ($form->{transdatefrom}) {
@@ -556,10 +589,12 @@ sub post_payment {
   $old_form = save_form();
 
   # Delete all entries in acc_trans from prior payments.
-  $self->_delete_payments($form, $dbh);
+  if (SL::DB::Default->get->payments_changeable != 0) {
+    $self->_delete_payments($form, $dbh);
+  }
 
   # Save the new payments the user made before cleaning up $form.
-  my $payments_re = '^datepaid_\d+$|^memo_\d+$|^source_\d+$|^exchangerate_\d+$|^paid_\d+$|^paid_project_id_\d+$|^AP_paid_\d+$|^paidaccounts$';
+  my $payments_re = '^datepaid_\d+$|^gldate_\d+$|^acc_trans_id_\d+$|^memo_\d+$|^source_\d+$|^exchangerate_\d+$|^paid_\d+$|^paid_project_id_\d+$|^AP_paid_\d+$|^paidaccounts$';
   map { $payments{$_} = $form->{$_} } grep m/$payments_re/, keys %{ $form };
 
   # Clean up $form so that old content won't tamper the results.
@@ -574,7 +609,7 @@ sub post_payment {
 
   # Set up the content of $form in the way that AR::post_transaction() expects.
 
-  $self->setup_form($form);
+  $self->setup_form($form, 1);
 
   $form->{exchangerate}    = $form->format_amount($myconfig, $form->{exchangerate});
   $form->{defaultcurrency} = $form->get_default_currency($myconfig);
@@ -608,7 +643,7 @@ sub post_payment {
 sub setup_form {
   $main::lxdebug->enter_sub();
 
-  my ($self, $form) = @_;
+  my ($self, $form, $for_post_payments) = @_;
 
   my ($exchangerate, $i, $j, $k, $key, $akey, $ref, $index, $taxamount, $totalamount, $totaltax, $totalwithholding, $withholdingrate,
       $taxincluded, $tax, $diff);
@@ -628,18 +663,25 @@ sub setup_form {
 
     $form->{$key} = $form->{"select$key"};
 
-    # if there is a value we have an old entry
     $j = 0;
     $k = 0;
 
+    # if there is a value we have an old entry
     next unless $form->{acc_trans}{$key};
+
+    # do not use old entries for payments. They come from the form
+    # even if they are not changeable (then they are in hiddens)
+    next if $for_post_payments && $key eq "AP_paid";
+
     for $i (1 .. scalar @{ $form->{acc_trans}{$key} }) {
 
       if ($key eq "AP_paid") {
         $j++;
         $form->{"AP_paid_$j"}         = "$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}";
+        $form->{"acc_trans_id_$j"}    = $form->{acc_trans}{$key}->[$i - 1]->{acc_trans_id};
         $form->{"paid_$j"}            = $form->{acc_trans}{$key}->[$i - 1]->{amount};
         $form->{"datepaid_$j"}        = $form->{acc_trans}{$key}->[$i - 1]->{transdate};
+        $form->{"gldate_$j"}          = $form->{acc_trans}{$key}->[$i - 1]->{gldate};
         $form->{"source_$j"}          = $form->{acc_trans}{$key}->[$i - 1]->{source};
         $form->{"memo_$j"}            = $form->{acc_trans}{$key}->[$i - 1]->{memo};