X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fap.pl;h=25c21966565e066fd7189ae35fa728d937b94a35;hb=eb8d3de878876804b0465ec7cde9adfff436a5a0;hp=0c1239f4123db8aa718efa58642166c029e2ccd6;hpb=7a7f33b5c1b3531ab761adba1cf19d4ad68cffcd;p=kivitendo-erp.git diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl index 0c1239f41..25c219665 100644 --- a/bin/mozilla/ap.pl +++ b/bin/mozilla/ap.pl @@ -223,17 +223,11 @@ sub form_header { } $readonly = ($form->{id}) ? "readonly" : ""; - $form->{radier} = - ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0; - $readonly = ($form->{radier}) ? "" : $readonly; + $form->{radier} = ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0; + $readonly = ($form->{radier}) ? "" : $readonly; - $form->{exchangerate} = $exchangerate - if ( - $form->{forex} = ( - $exchangerate = - $form->check_exchangerate( - \%myconfig, $form->{currency}, $form->{transdate}, 'sell' - ))); + $form->{forex} = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{transdate}, 'sell'); + $form->{exchangerate} = $form->{forex} if $form->{forex}; # format amounts @@ -898,17 +892,12 @@ sub update { map { $form->{invtotal} += $form->{"amount_$_"} } (1 .. $form->{rowcount}); - $form->{exchangerate} = $exchangerate - if ( - $form->{forex} = ( - $exchangerate = - $form->check_exchangerate( - \%myconfig, $form->{currency}, $form->{transdate}, 'sell' - ))); + $form->{forex} = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{transdate}, 'sell'); + $form->{exchangerate} = $form->{forex} if $form->{forex}; $form->{invdate} = $form->{transdate}; $save_AP = $form->{AP}; - &check_name(vendor); + &check_name("vendor"); $form->{AP} = $save_AP; $form->{rowcount} = $count + 1; @@ -925,13 +914,8 @@ sub update { $totalpaid += $form->{"paid_$i"}; - $form->{"exchangerate_$i"} = $exchangerate - if ( - $form->{"forex_$i"} = ( - $exchangerate = - $form->check_exchangerate( - \%myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'sell' - ))); + $form->{"forex_$i"} = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'sell'); + $form->{"exchangerate_$i"} = $form->{"forex_$i"} if $form->{"forex_$i"}; } } @@ -941,6 +925,9 @@ sub update { $form->{oldinvtotal} = $form->{invtotal}; $form->{oldtotalpaid} = $totalpaid; + # notes + $form->{notes} = $form->{intnotes}; + &display_form; $lxdebug->leave_sub();