X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAR.pm;h=e1501b7f7a68ebfef2a2faac2203af1c9b3fe652;hb=1bc5165546da59c9b7317e0ba790eb9b43c10e21;hp=7aa709df47d0986b4339489365b8443912b3fa94;hpb=e87f4016fbce09fc32b3b7ca18b78f364ad6ee6f;p=kivitendo-erp.git diff --git a/SL/AR.pm b/SL/AR.pm index 7aa709df4..e1501b7f7 100644 --- a/SL/AR.pm +++ b/SL/AR.pm @@ -354,7 +354,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); @@ -427,6 +427,7 @@ sub ar_transactions { qq| a.transaction_description, | . qq| pr.projectnumber AS globalprojectnumber, | . qq| c.name, c.customernumber, c.country, c.ustid, b.description as customertype, | . + qq| c.id as customer_id, | . qq| e.name AS employee, | . qq| e2.name AS salesman, | . qq| tz.description AS taxzone, | . @@ -560,7 +561,7 @@ sub get_transdate { sub setup_form { $main::lxdebug->enter_sub(); - my ($self, $form) = @_; + my ($self, $form, $for_post_payments) = @_; my ($exchangerate, $akey, $j, $k, $index, $taxamount, $totaltax, $taxrate, $diff, $totalwithholding, $withholdingrate, $totalamount, $taxincluded, $tax); @@ -570,12 +571,16 @@ sub setup_form { $exchangerate = $form->{exchangerate} ? $form->{exchangerate} : 1; foreach my $key (keys %{ $form->{AR_links} }) { - # 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 "AR_paid"; + for my $i (1 .. scalar @{ $form->{acc_trans}{$key} }) { if ($key eq "AR_paid") { $j++;