X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Far.pl;h=8b75b2da9122573bc779ef06661572c08bc86413;hb=84da0ba2f48ac09652557a5aca1a912b06fb0b0b;hp=540a4f12ee0ef266821fd588e96d62dc807791d8;hpb=326d4c54db908fe57a661a472152cd1a4607aebe;p=kivitendo-erp.git diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl index 540a4f12e..8b75b2da9 100644 --- a/bin/mozilla/ar.pl +++ b/bin/mozilla/ar.pl @@ -37,6 +37,7 @@ use SL::PE; use Data::Dumper; require "$form->{path}/arap.pl"; +require "bin/mozilla/common.pl"; 1; @@ -79,6 +80,7 @@ sub add { unless $form->{callback}; &create_links; + AR->get_transdate(\%myconfig, $form); &display_form; $lxdebug->leave_sub(); @@ -202,6 +204,7 @@ sub create_links { $form->{"forex_$j"} = $form->{"exchangerate_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{exchangerate}; $form->{"AR_paid_$j"} = "$form->{acc_trans}{$key}->[$i-1]->{accno}"; + $form->{"paid_project_id_$j"} = $form->{acc_trans}{$key}->[$i - 1]->{project_id}; $form->{paidaccounts}++; } else { @@ -291,6 +294,8 @@ sub create_links { ($form->datetonum($form->{transdate}, \%myconfig) <= $form->datetonum($form->{closedto}, \%myconfig)); + $form->{"ARselected"} = $form->{"AR_1"}; + $lxdebug->leave_sub(); } @@ -330,6 +335,11 @@ sub form_header { ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0; $readonly = ($form->{radier}) ? "" : $readonly; + my $ARselected_quoted = quotemeta($form->{"ARselected"}); + $form->{selectAR} = $form->{AR}; + $form->{selectAR} =~ + s/value=\"${ARselected_quoted}\"/value=\"$form->{ARselected}\" selected/; + # set option selected foreach $item (qw(customer currency department employee)) { $form->{"select$item"} =~ s/ selected//; @@ -412,6 +422,21 @@ sub form_header { |; } + my @old_project_ids = (); + map({ push(@old_project_ids, $form->{"project_id_$_"}) + if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"})); + + $form->get_lists("projects" => { "key" => "ALL_PROJECTS", + "all" => 0, + "old_id" => \@old_project_ids }); + + my %project_labels = (); + my @project_values = (""); + foreach my $item (@{ $form->{"ALL_PROJECTS"} }) { + push(@project_values, $item->{"id"}); + $project_labels{$item->{"id"}} = $item->{"projectnumber"}; + } + $form->{fokus} = "arledger.customer"; # use JavaScript Calendar or not @@ -523,7 +548,7 @@ sub form_header {
| + | | . $locale->text('Incoming Payments') . qq| | " . $locale->text('Date') . " | "; @@ -644,7 +673,8 @@ $jsscript $column_data{exchangerate} = "" . $locale->text('Exch') . " | "; $column_data{AR_paid} = "" . $locale->text('Account') . " | "; $column_data{source} = "" . $locale->text('Source') . " | "; - $column_data{memo} = "" . $locale->text('Memo') . " | "; + $column_data{memo} = "" . $locale->text('Memo') . " | "; + $column_data{paid_project_id} = "" . $locale->text('Project Number') . " | "; print "||||
---|---|---|---|---|---|---|---|---|---|---|---|---|
|; $column_data{exchangerate} = qq| | $exchangerate | |; $column_data{datepaid} = - qq|{"datepaid_$i"}> | |; + qq|{"datepaid_$i"}> + | |; $column_data{source} = qq||; $column_data{memo} = qq| | |; + $column_data{paid_project_id} = + qq| | | + . NTI($cgi->popup_menu('-name' => "paid_project_id_$i", + '-values' => \@project_values, + '-labels' => \%project_labels, + '-default' => $form->{"paid_project_id_$i"} )) + . qq| | |; + map { print qq|$column_data{$_}\n| } @column_index; print " "; + push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i"); } map { $form->{$_} =~ s/\"/"/g } qw(selectAR_paid); - print qq| + + print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) . + qq| {paidaccounts}> @@ -727,6 +770,8 @@ sub form_footer { print qq| + + {path}> @@ -739,40 +784,36 @@ sub form_footer { $transdate = $form->datetonum($form->{transdate}, \%myconfig); $closedto = $form->datetonum($form->{closedto}, \%myconfig); + print qq| +|; if ($form->{id}) { if ($form->{radier}) { - print qq| - |; - - print qq| + print qq| |; - } - if ($transdate > $closedto) { - print qq| + } + if ($transdate > $closedto) { + print qq| |; - } - + } + print qq| + + |; + } else { if ($transdate > $closedto) { print qq| - |; } } - if ($form->{menubar}) { - require "$form->{path}/menu.pl"; - &menubar; - } - print " @@ -798,11 +839,6 @@ sub update { # $form->{selectAR_amount} =~ # s/value=\"$form->{AR_amountselected}\"/value=\"$form->{AR_amountselected}\" selected/; - $form->{selectAR} = $form->{AR}; - - $form->{selectAR} =~ - s/value=\"$form->{ARselected}\"/value=\"$form->{ARselected}\" selected/; - ($AR_amountaccno, $AR_amounttaxkey) = split(/--/, $form->{AR_amountselected}); $form->{selecttaxchart} = $form->{taxchart}; @@ -862,8 +898,6 @@ sub update { &check_name(customer); $form->{AR} = $save_AR; - &check_project; - $form->{invtotal} = ($form->{taxincluded}) ? $form->{invtotal} : $form->{invtotal} + $totaltax; @@ -897,6 +931,36 @@ sub update { $lxdebug->leave_sub(); } +sub post_payment { + $lxdebug->enter_sub(); + for $i (1 .. $form->{paidaccounts}) { + if ($form->{"paid_$i"}) { + $datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig); + + $form->isblank("datepaid_$i", $locale->text('Payment date missing!')); + + $form->error($locale->text('Cannot post payment for a closed period!')) + if ($datepaid <= $closedto); + + if ($form->{currency} ne $form->{defaultcurrency}) { + $form->{"exchangerate_$i"} = $form->{exchangerate} + if ($invdate == $datepaid); + $form->isblank("exchangerate_$i", + $locale->text('Exchangerate for payment missing!')); + } + } + } + + ($form->{AR}) = split /--/, $form->{AR}; + ($form->{AR_paid}) = split /--/, $form->{AR_paid}; + $form->redirect($locale->text(' Payment posted!')) + if (AR->post_payment(\%myconfig, \%$form)); + $form->error($locale->text('Cannot post payment!')); + + + $lxdebug->leave_sub(); +} + sub post { $lxdebug->enter_sub(); @@ -1092,6 +1156,19 @@ sub search {|; } + $form->get_lists("projects" => { "key" => "ALL_PROJECTS", + "all" => 1 }); + + my %labels = (); + my @values = (""); + foreach my $item (@{ $form->{"ALL_PROJECTS"} }) { + push(@values, $item->{"id"}); + $labels{$item->{"id"}} = $item->{"projectnumber"}; + } + my $projectnumber = + NTI($cgi->popup_menu('-name' => 'project_id', '-values' => \@values, + '-labels' => \%labels)); + $form->{fokus} = "search.customer"; $form->header; @@ -1123,6 +1200,10 @@ sub search { | | . $locale->text('Notes') . qq| | + | |||
| . $locale->text("Project Number") . qq| | +$projectnumber | +|||||||||||
| . $locale->text('From') . qq| | $button1 @@ -1189,6 +1270,8 @@ sub search {||||||||||||
| . $locale->text('Subtotal') . qq| | ++ | | . $locale->text('Project Number') . qq| |