projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:kivitendo/kivitendo-erp
[kivitendo-erp.git]
/
bin
/
mozilla
/
ar.pl
diff --git
a/bin/mozilla/ar.pl
b/bin/mozilla/ar.pl
index
a05a971
..
e1b10f6
100644
(file)
--- a/
bin/mozilla/ar.pl
+++ b/
bin/mozilla/ar.pl
@@
-100,7
+100,7
@@
sub add {
AR->get_transdate(\%myconfig, $form);
$form->{initial_transdate} = $form->{transdate};
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();
$form->{transdate} = $form->{initial_transdate};
&display_form;
$main::lxdebug->leave_sub();
@@
-119,7
+119,7
@@
sub edit {
$form->{javascript} .= qq|<script type="text/javascript" src="js/common.js"></script>|;
$form->{title} = "Edit";
$form->{javascript} .= qq|<script type="text/javascript" src="js/common.js"></script>|;
$form->{title} = "Edit";
-
&create_links
;
+
create_links()
;
&display_form;
$main::lxdebug->leave_sub();
&display_form;
$main::lxdebug->leave_sub();
@@
-143,12
+143,17
@@
sub create_links {
$main::auth->assert('general_ledger');
$main::auth->assert('general_ledger');
+ my %params = @_;
my $form = $main::form;
my %myconfig = %main::myconfig;
$form->create_links("AR", \%myconfig, "customer");
my $form = $main::form;
my %myconfig = %main::myconfig;
$form->create_links("AR", \%myconfig, "customer");
- my %saved = map { ($_ => $form->{$_}) } qw(direct_debit duedate id taxincluded);
+ 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);
IS->get_customer(\%myconfig, \%$form);
@@
-664,6
+669,9
@@
sub post {
my $closedto = $form->datetonum($form->{closedto}, \%myconfig);
my $transdate = $form->datetonum($form->{transdate}, \%myconfig);
my $closedto = $form->datetonum($form->{closedto}, \%myconfig);
my $transdate = $form->datetonum($form->{transdate}, \%myconfig);
+
+ $form->error($locale->text('Cannot post transaction above the maximum future booking date!'))
+ if ($form->date_max_future($transdate, \%myconfig));
$form->error($locale->text('Cannot post transaction for a closed period!')) if ($form->date_closed($form->{"transdate"}, \%myconfig));
$form->error($locale->text('Zero amount posting!'))
$form->error($locale->text('Cannot post transaction for a closed period!')) if ($form->date_closed($form->{"transdate"}, \%myconfig));
$form->error($locale->text('Zero amount posting!'))