X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/blobdiff_plain/eaa48aeab931d62b1a14bba95537480758695655..ec93aab75346a6caeeeca81ddc7a070e73a6a7c8:/bin/mozilla/ap.pl diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl index 2cfff88d6..60a104887 100644 --- a/bin/mozilla/ap.pl +++ b/bin/mozilla/ap.pl @@ -36,6 +36,7 @@ use SL::IR; use SL::PE; require "$form->{path}/arap.pl"; +require "bin/mozilla/common.pl"; 1; @@ -192,6 +193,7 @@ sub create_links { $form->{"forex_$j"} = $form->{"exchangerate_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{exchangerate}; $form->{"AP_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 { @@ -396,6 +398,21 @@ sub form_header { ? qq|| : qq||; + 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"}; + } + # use JavaScript Calendar or not $form->{jsscript} = $jscalendar; $jsscript = ""; @@ -557,6 +574,12 @@ $jsscript my $korrektur = $form->{"korrektur_$i"} ? 'checked' : ''; + my $projectnumber = + NTI($cgi->popup_menu('-name' => "project_id_$i", + '-values' => \@project_values, + '-labels' => \%project_labels, + '-default' => $form->{"project_id_$i"} )); + print qq| @@ -564,9 +587,7 @@ $jsscript {"tax_$i"}> $tax - - {"project_id_$i"}> - + $projectnumber |; $amount = ""; @@ -617,14 +638,14 @@ $jsscript - + |; if ($form->{currency} eq $form->{defaultcurrency}) { - @column_index = qw(datepaid source memo paid AP_paid); + @column_index = qw(datepaid source memo paid AP_paid paid_project_id); } else { - @column_index = qw(datepaid source memo paid exchangerate AP_paid); + @column_index = qw(datepaid source memo paid exchangerate AP_paid paid_project_id); } $column_data{datepaid} = ""; @@ -633,6 +654,7 @@ $jsscript $column_data{AP_paid} = ""; $column_data{source} = ""; $column_data{memo} = ""; + $column_data{paid_project_id} = ""; print " @@ -688,6 +710,13 @@ $jsscript qq||; $column_data{"memo_$i"} = qq||; + $column_data{"paid_project_id_$i"} = + qq||; map { print qq|$column_data{"${_}_$i"}\n| } @column_index; @@ -720,6 +749,7 @@ sub form_footer { print qq| +{path}> {login}> @@ -731,34 +761,32 @@ sub form_footer { $transdate = $form->datetonum($form->{transdate}, \%myconfig); $closedto = $form->datetonum($form->{closedto}, \%myconfig); + print qq||; + if ($form->{id}) { # print qq| # |; - if ($form->{radier}) { - print qq| + if ($form->{radier}) { + print qq| |; - } + } - print qq| + print qq| -|; - print qq| |; - } else { - if (($transdate > $closedto) && !$form->{id}) { - print qq| + } elsif (($transdate > $closedto) && !$form->{id}) { + print qq| |; - } + . $locale->text('Post') . qq|">|; } print " @@ -842,7 +870,6 @@ sub update { &check_name(vendor); $form->{AP} = $save_AP; - &check_project; $form->{rowcount} = $count + 1; $form->{invtotal} = @@ -1101,6 +1128,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->header; print qq| @@ -1133,6 +1173,10 @@ sub search { + + + + $button1 @@ -1197,6 +1241,8 @@ sub search { + +
| . $locale->text('Payments') . qq|| . $locale->text('Payments') . qq|
" . $locale->text('Date') . "" . $locale->text('Account') . "" . $locale->text('Source') . "" . $locale->text('Memo') . "" . $locale->text('Project Number') . "
| + . NTI($cgi->popup_menu('-name' => "paid_project_id_$i", + '-values' => \@project_values, + '-labels' => \%project_labels, + '-default' => $form->{"paid_project_id_$i"} )) + . qq| | . $locale->text('Notes') . qq|
| . $locale->text("Project Number") . qq|$projectnumber
| . $locale->text('From') . qq|
| . $locale->text('Subtotal') . qq|| . $locale->text('Project Number') . qq|
@@ -1299,10 +1345,14 @@ sub ap_transactions { $option .= "\n
" if ($option); $option .= $locale->text('Closed'); } + if ($form->{globalproject_id}) { + $callback .= "&globalproject_id=" . E($form->{globalproject_id}); + $href .= "&globalproject_id=" . E($form->{globalproject_id}); + } - @columns = $form->sort_columns( - qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid due duedate notes employee) - ); + @columns = + qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid + due duedate notes employee globalprojectnumber); foreach $item (@columns) { if ($form->{"l_$item"} eq "Y") { @@ -1362,6 +1412,8 @@ sub ap_transactions { $column_header{employee} = "" . $locale->text('Employee') . ""; + $column_header{globalprojectnumber} = + qq|| . $locale->text('Project Number') . qq||; $form->{title} = $locale->text('AP Transactions'); @@ -1452,6 +1504,8 @@ sub ap_transactions { $ap->{notes} =~ s/\r\n/
/g; $column_data{notes} = "$ap->{notes} "; $column_data{employee} = "$ap->{employee} "; + $column_data{globalprojectnumber} = + "" . H($ap->{globalprojectnumber}) . ""; $i++; $i %= 2;