X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fap.pl;h=f961ead5d380b8efa05bce69566f5adff121c8b6;hb=6881b4bd6a669dd991b227ecf41c3e8662806595;hp=bc2986c27e35c03568fbbc5d4e11b31f57a5b915;hpb=62ffcb1aa838fa3d4e266aef02918574bc7ca6be;p=kivitendo-erp.git
diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index bc2986c27..f961ead5d 100644
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -195,7 +195,7 @@ sub form_header {
my $form = $main::form;
my %myconfig = %main::myconfig;
my $locale = $main::locale;
- my $cgi = $main::cgi;
+ my $cgi = $::request->{cgi};
$main::auth->assert('general_ledger');
@@ -285,7 +285,8 @@ sub form_header {
my $notes =
qq||;
- my $department = qq|
+ my $department;
+ $department = qq|
| . $locale->text('Department') . qq| |
@@ -370,7 +371,7 @@ sub form_header {
# with JavaScript Calendar
$button1 = qq|
- | |
+ |
text('button') . qq|> |
|;
@@ -388,7 +389,7 @@ sub form_header {
# without JavaScript Calendar
$button1 =
- qq| | |;
+ qq| | |;
$button2 =
qq| | |;
}
@@ -693,10 +694,17 @@ $jsscript
$form->format_amount(\%myconfig, $form->{"exchangerate_$i"});
}
+ print qq|{"acc_trans_id_$i"}>\n|;
print qq|{"gldate_$i"}>\n|;
- my $changeable = (($form->{"gldate_$i"} eq '') || $form->current_date(\%myconfig) eq $form->{"gldate_$i"});
- $form->{"payment_readonly_$i"} = ($changeable)? 0 : 1;
- print qq|{"payment_readonly_$i"}>\n|;
+ my $changeable = 1;
+ if ($::lx_office_conf{features}->{payments_changeable} == 0) {
+ # never
+ $changeable = ($form->{"acc_trans_id_$i"})? 0 : 1;
+ }
+ if ($::lx_office_conf{features}->{payments_changeable} == 2) {
+ # on the same day
+ $changeable = (($form->{"gldate_$i"} eq '') || $form->current_date(\%myconfig) eq $form->{"gldate_$i"});
+ }
$exchangerate = qq| |;
if ($form->{defaultcurrency} && ($form->{currency} ne $form->{defaultcurrency})) {
@@ -708,7 +716,7 @@ $jsscript
$exchangerate =
qq|{"exchangerate_$i"}>|;
} else {
- $exchangerate = qq|$form->{"exchangerate_$i"}|.
+ $exchangerate =
qq|{"exchangerate_$i"}>$form->{"exchangerate_$i"}|;
}
}
@@ -774,12 +782,12 @@ $jsscript
qq|{"paid_project_id_$i"}>|;
}
- $column_data{"paid_$i"} = $paid;
- $column_data{"AP_paid_$i"} = $AP_paid;
- $column_data{"exchangerate_$i"} = qq|$exchangerate | |;
- $column_data{"datepaid_$i"} = $datepaid;
- $column_data{"source_$i"} = $source;
- $column_data{"memo_$i"} = $memo;
+ $column_data{"paid_$i"} = $paid;
+ $column_data{"AP_paid_$i"} = $AP_paid;
+ $column_data{"exchangerate_$i"} = qq|$exchangerate | |;
+ $column_data{"datepaid_$i"} = $datepaid;
+ $column_data{"source_$i"} = $source;
+ $column_data{"memo_$i"} = $memo;
$column_data{"paid_project_id_$i"} = $paid_project_id;
map { print qq|$column_data{"${_}_$i"}\n| } @column_index;
@@ -824,90 +832,37 @@ $jsscript
}
sub form_footer {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
- my $cgi = $main::cgi;
-
- $main::auth->assert('general_ledger');
+ $::lxdebug->enter_sub;
+ $::auth->assert('general_ledger');
- my $follow_ups_block;
- if ($form->{id}) {
- my $follow_ups = FU->follow_ups('trans_id' => $form->{id});
+ my $num_due;
+ my $num_follow_ups;
+ 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 }) {
+ $num_due = sum map { $_->{due} * 1 } @{ $follow_ups };
+ $num_follow_ups = scalar @{ $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|
-
-
-|;
-
- if (!$form->{id} && $form->{draft_id}) {
- print(NTI($cgi->checkbox('-name' => 'remove_draft', '-id' => 'remove_draft',
- '-value' => 1, '-checked' => $form->{remove_draft},
- '-label' => '')) .
- qq|
|);
- }
-
- my $transdate = $form->datetonum($form->{transdate}, \%myconfig);
- my $closedto = $form->datetonum($form->{closedto}, \%myconfig);
-
- print qq||;
+ my $transdate = $::form->datetonum($::form->{transdate}, \%::myconfig);
+ my $closedto = $::form->datetonum($::form->{closedto}, \%::myconfig);
- if ($form->{id}) {
- if ($form->{radier}) {
- print qq|
-
-|;
- }
- # ToDO: - insert a global check for stornos, so that a storno is only possible a limited time after saving it
- print qq| |
- if ($form->{id} && !IS->has_storno(\%myconfig, $form, 'ap') && !IS->is_storno(\%myconfig, $form, 'ap', $form->{id}) && (($form->{totalpaid} == 0) || ($form->{totalpaid} eq "")));
-
- print qq|
-
-
-|;
- } elsif (($transdate > $closedto) && !$form->{id}) {
- print qq|
- | .
- NTI($cgi->submit('-name' => 'action', '-value' => $locale->text('Save draft'), '-class' => 'submit'));
- }
- # button for saving history
- if($form->{id} ne "") {
- print qq| |;
- }
- # /button for saving history
- # mark_as_paid button
- if($form->{id} ne "") {
- print qq| |;
- }
- # /mark_as_paid button
- print "
-
+ my $storno = $::form->{id}
+ && !IS->has_storno(\%::myconfig, $::form, 'ap')
+ && !IS->is_storno( \%::myconfig, $::form, 'ap', $::form->{id})
+ && ($::form->{totalpaid} == 0 || $::form->{totalpaid} eq '');
-