X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Far.pl;h=6a024a3cffaf8aaa9a6baba84d62b9c5ac723c39;hb=a87694dc525b4eabff11029f1e5401621e2bd3bc;hp=45193ed877097e6c9d5161bc67a53925ab76ebc8;hpb=0ba3b647155cba9b668cbcc7579fd135b3a1a9be;p=kivitendo-erp.git diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl index 45193ed87..6a024a3cf 100644 --- a/bin/mozilla/ar.pl +++ b/bin/mozilla/ar.pl @@ -38,6 +38,7 @@ use SL::AR; use SL::FU; use SL::IS; use SL::PE; +use SL::DB::Default; use SL::ReportGenerator; require "bin/mozilla/arap.pl"; @@ -99,7 +100,7 @@ sub add { AR->get_transdate(\%myconfig, $form); $form->{initial_transdate} = $form->{transdate}; - &create_links; + create_links(dont_save => 1); $form->{transdate} = $form->{initial_transdate}; &display_form; $main::lxdebug->leave_sub(); @@ -118,7 +119,7 @@ sub edit { $form->{javascript} .= qq||; $form->{title} = "Edit"; - &create_links; + create_links(); &display_form; $main::lxdebug->leave_sub(); @@ -142,27 +143,24 @@ sub create_links { $main::auth->assert('general_ledger'); + my %params = @_; my $form = $main::form; my %myconfig = %main::myconfig; - my ($duedate, $taxincluded); - $form->create_links("AR", \%myconfig, "customer"); - $duedate = $form->{duedate}; - $taxincluded = $form->{taxincluded}; - my $id = $form->{id}; + my %saved; + if (!$params{dont_save}) { + %saved = map { ($_ => $form->{$_}) } qw(direct_debit id taxincluded); + $saved{duedate} = $form->{duedate} if $form->{duedate}; + } + IS->get_customer(\%myconfig, \%$form); - $form->{taxincluded} = $taxincluded; - $form->{id} = $id; - $form->{duedate} = $duedate if $duedate; + $form->{$_} = $saved{$_} for keys %saved; $form->{oldcustomer} = "$form->{customer}--$form->{customer_id}"; $form->{rowcount} = 1; - # notes - $form->{notes} = $form->{intnotes} unless $form->{notes}; - # currencies $form->{defaultcurrency} = $form->get_default_currency(\%myconfig); @@ -219,7 +217,6 @@ sub form_header { my ($title, $readonly, $exchangerate, $rows); my ($notes, $department, $customer, $employee, $amount, $project); - my ($onload); my ($ARselected); @@ -252,7 +249,9 @@ sub form_header { #/show history button js $readonly = ($form->{id}) ? "readonly" : ""; - $form->{radier} = ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0; + $form->{radier} = ($::instance_conf->get_ar_changeable == 2) + ? ($form->current_date(\%myconfig) eq $form->{gldate}) + : ($::instance_conf->get_ar_changeable == 1); $readonly = ($form->{radier}) ? "" : $readonly; # set option selected @@ -316,8 +315,6 @@ sub form_header { $taxcharts{$item->{id}} = $item; } - $form->{fokus} = "arledger.customer"; - my $follow_up_vc = $form->{customer}; $follow_up_vc =~ s/--.*?//; my $follow_up_trans_info = "$form->{invnumber} ($follow_up_vc)"; @@ -326,9 +323,6 @@ sub form_header { qq|| . qq||; - $onload = qq|focus()|; - $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|; - # $amount = $locale->text('Amount'); # $project = $locale->text('Project'); @@ -337,7 +331,7 @@ sub form_header { my $transaction = { amount => $form->{"amount_$i"}, tax => $form->{"tax_$i"}, - project_id => $form->{"project_id_$i"}, + project_id => ($i==$form->{rowcount}) ? $form->{globalproject_id} : $form->{"project_id_$i"}, }; my $selected_accno_full; @@ -415,18 +409,21 @@ sub form_header { gldate => $form->{"gldate_$i"}, }; + # default account for current assets (i.e. 1801 - SKR04) if no account is selected + $form->{accno_arap} = IS->get_standard_accno_current_assets(\%myconfig, \%$form); + $payment->{selectAR_paid} = NTI($cgi->popup_menu('-name' => "AR_paid_$i", '-id' => "AR_paid_$i", '-values' => \@AR_paid_values, '-labels' => \%chart_labels, - '-default' => $payment->{AR_paid})); + '-default' => $payment->{AR_paid} || $form->{accno_arap})); $payment->{changeable} = - $::lx_office_conf{features}->{payments_changeable} == 0 ? !$payment->{acc_trans_id} # never - : $::lx_office_conf{features}->{payments_changeable} == 2 ? $payment->{gldate} eq '' || $payment->{gldate} eq $now + SL::DB::Default->get->payments_changeable == 0 ? !$payment->{acc_trans_id} # never + : SL::DB::Default->get->payments_changeable == 2 ? $payment->{gldate} eq '' || $payment->{gldate} eq $now : 1; push @payments, $payment; @@ -443,7 +440,6 @@ sub form_header { project_labels => \%project_labels, rows => $rows, ARselected => $ARselected, - onload => $onload, title_str => $title, follow_up_trans_info => $follow_up_trans_info, }); @@ -461,96 +457,29 @@ sub form_footer { my $locale = $main::locale; my $cgi = $::request->{cgi}; - my ($transdate, $closedto); - - my $follow_ups_block; - if ($form->{id}) { + if ( $form->{id} ) { my $follow_ups = FU->follow_ups('trans_id' => $form->{id}); - - if (@{ $follow_ups} ) { - my $num_due = sum map { $_->{due} * 1 } @{ $follow_ups }; - $follow_ups_block = qq|
| . $locale->text("There are #1 unfinished follow-ups of which #2 are due.", scalar @{ $follow_ups }, $num_due) . qq|
|; + if ( @{ $follow_ups} ) { + $form->{follow_up_length} = scalar(@{$follow_ups}); + $form->{follow_up_due_length} = sum(map({ $_->{due} * 1 } @{ $follow_ups })); } } - print qq| - -$follow_ups_block - - - - -| -. $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}]) -. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}]) -. qq| - -