X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fap.pl;h=f5c6609528d4a8c8ad853c9b4040aa8bee6aeeb7;hb=036fe04d0f9d0ccfc7ef563530d3c118986ef0ca;hp=2f31a59918b6bcf04371e2f6d0cedabe27562f63;hpb=8ec0d29a33e23ce962b807e87cc8b577c8c98ec2;p=kivitendo-erp.git diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl index 2f31a5991..f5c660952 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; @@ -87,6 +88,9 @@ sub add { sub edit { $lxdebug->enter_sub(); + # show history button + $form->{javascript} = qq||; + #/show hhistory button $form->{title} = "Edit"; @@ -192,6 +196,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 { @@ -279,6 +284,8 @@ sub create_links { ($form->datetonum($form->{transdate}, \%myconfig) <= $form->datetonum($form->{closedto}, \%myconfig)); + $form->{"APselected"} = $form->{"AP_1"}; + $lxdebug->leave_sub(); } @@ -321,6 +328,11 @@ sub form_header { } $readonly = ($form->{id}) ? "readonly" : ""; + my $APselected_quoted = quotemeta($form->{"APselected"}); + $form->{selectAP} = $form->{AP}; + $form->{selectAP} =~ + s/value=\"${APselected_quoted}\"/value=\"$form->{APselected}\" selected/; + $form->{radier} = ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0; $readonly = ($form->{radier}) ? "" : $readonly; @@ -389,6 +401,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 = ""; @@ -550,6 +577,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|
| . $locale->text('Payments') . qq| | +| . $locale->text('Payments') . qq| | " . $locale->text('Date') . " | "; @@ -626,6 +657,7 @@ $jsscript $column_data{AP_paid} = "" . $locale->text('Account') . " | "; $column_data{source} = "" . $locale->text('Source') . " | "; $column_data{memo} = "" . $locale->text('Memo') . " | "; + $column_data{paid_project_id} = "" . $locale->text('Project Number') . " | "; print "||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|
|; $column_data{"exchangerate_$i"} = qq| | $exchangerate | |; $column_data{"datepaid_$i"} = - qq|{"datepaid_$i"}> + qq| | {"datepaid_$i"}> | |; $column_data{"source_$i"} = qq||; $column_data{"memo_$i"} = qq| | |; + $column_data{"paid_project_id_$i"} = + 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{"${_}_$i"}\n| } @column_index; @@ -713,6 +752,7 @@ sub form_footer { print qq| + {path}> {login}> @@ -724,33 +764,43 @@ 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| + |; - - } else { - if (($transdate > $closedto) && !$form->{id}) { - print qq| + } elsif (($transdate > $closedto) && !$form->{id}) { + print qq| |; - } + . $locale->text('Post') . qq|">|; } - + # button for saving history + if($form->{id} ne "") { + print qq| + {id} + . qq|); name=history id=history value=| + . $locale->text('history') + . qq|>|; + } + # /button for saving history print " @@ -776,10 +826,6 @@ sub update { # $form->{selectAP_amount} =~ # s/value=\"$form->{AP_amountselected}\"/value=\"$form->{AP_amountselected}\" selected/; - $form->{selectAP} = $form->{AP}; - $form->{selectAP} =~ - s/value=\"$form->{APselected}\"/value=\"$form->{APselected}\" selected/; - ($AP_amountaccno, $AP_amounttaxkey) = split(/--/, $form->{AP_amountselected}); $form->{selecttaxchart} = $form->{taxchart}; @@ -836,7 +882,6 @@ sub update { &check_name(vendor); $form->{AP} = $save_AP; - &check_project; $form->{rowcount} = $count + 1; $form->{invtotal} = @@ -872,6 +917,38 @@ 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->{AP}) = split /--/, $form->{AP}; + ($form->{AP_paid}) = split /--/, $form->{AP_paid}; + $form->redirect($locale->text(' Payment posted!')) + if (AP->post_payment(\%myconfig, \%$form)); + $form->error($locale->text('Cannot post payment!')); + + + $lxdebug->leave_sub(); +} + + sub post { $lxdebug->enter_sub(); @@ -923,6 +1000,12 @@ sub post { $form->{taxkey} = $taxkey; $form->{id} = 0 if $form->{postasnew}; + # saving the history + if(!exists $form->{addition} && $form->{id} ne "") { + $form->{addition} = "POSTED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history $form->redirect($locale->text('Transaction posted!')) if (AP->post_transaction(\%myconfig, \%$form)); @@ -935,6 +1018,12 @@ sub post_as_new { $lxdebug->enter_sub(); $form->{postasnew} = 1; + # saving the history + if(!exists $form->{addition} && $form->{id} ne "") { + $form->{addition} = "POSTED AS NEW"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history &post; $lxdebug->leave_sub(); @@ -992,9 +1081,15 @@ sub delete { sub yes { $lxdebug->enter_sub(); - - $form->redirect($locale->text('Transaction deleted!')) - if (AP->delete_transaction(\%myconfig, \%$form, $spool)); + if (AP->delete_transaction(\%myconfig, \%$form, $spool)) { + # saving the history + if(!exists $form->{addition}) { + $form->{addition} = "DELETED"; + $form->save_history($form->dbconnect(\%myconfig)); + } + # /saving the history + $form->redirect($locale->text('Transaction deleted!')); + } $form->error($locale->text('Cannot delete transaction!')); $lxdebug->leave_sub(); @@ -1063,6 +1158,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| @@ -1095,6 +1203,10 @@ sub search { | | . $locale->text('Notes') . qq| | ||||
| . $locale->text("Project Number") . qq| | +$projectnumber | +|||||||||||
| . $locale->text('From') . qq| | $button1 @@ -1159,6 +1271,8 @@ sub search {||||||||||||
| . $locale->text('Subtotal') . qq| | ++ | | . $locale->text('Project Number') . qq| |