X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fis.pl;h=7bbcc12a7c91d8fd73b8f9de016b449c4b6ce8ba;hb=72539cb39a3d19f930a8e0e41e46bf41afe9a8f1;hp=2baf7ec0632963a3172c7d383a877a8434ed7723;hpb=8f3dc0b4dfd14847df54366f0c146d058522d022;p=kivitendo-erp.git
diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 2baf7ec06..7bbcc12a7 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -59,7 +59,7 @@ sub add {
}
&invoice_links;
&prepare_invoice;
- $form->{format} ="pdf";
+ $form->{format} = "pdf";
&display_form;
@@ -76,7 +76,7 @@ sub edit {
$form->error("Access Denied");
}
if ($form->{print_and_post}) {
- $form->{action} = "print";
+ $form->{action} = "print";
$form->{resubmit} = 1;
}
&invoice_links;
@@ -334,11 +334,20 @@ sub form_header {
text('button') . qq|>
|;
+ $button3 = qq|
+ {deliverydate}>
+ text('button') . qq|>
+ |;
#write Trigger
$jsscript =
- Form->write_trigger(\%myconfig, "2", "invdate", "BL", "trigger1",
- "duedate", "BL", "trigger2");
+ Form->write_trigger(\%myconfig, "3",
+ "invdate", "BL",
+ "trigger1", "duedate",
+ "BL", "trigger2",
+ "deliverydate", "BL",
+ "trigger3");
} else {
# without JavaScript Calendar
@@ -348,8 +357,9 @@ sub form_header {
qq| {duedate}> |;
}
if ($form->{resubmit} && ($form->{format} eq "html")) {
- $onload = qq|window.open('about:blank','Beleg'); document.invoice.target = 'Beleg';document.invoice.submit()|;
- } elsif($form->{resubmit}) {
+ $onload =
+ qq|window.open('about:blank','Beleg'); document.invoice.target = 'Beleg';document.invoice.submit()|;
+ } elsif ($form->{resubmit}) {
$onload = qq|document.invoice.submit()|;
} else {
$onload = "fokus()";
@@ -470,6 +480,10 @@ sub form_header {
| . $locale->text('Due Date') . qq|
$button2
+
+ | . $locale->text('Delivery Date') . qq|
+ $button3
+
| . $locale->text('Order Number') . qq|
@@ -1071,8 +1085,10 @@ sub post {
$form->{id} = 0 if $form->{postasnew};
- $form->{invnumber} = $form->update_defaults(\%myconfig, "invnumber")
- unless $form->{invnumber};
+ # get new invnumber in sequence if no invnumber is given or if posasnew was requested
+ if (!$form->{invnumber} || $form->{postasnew}) {
+ $form->{invnumber} = $form->update_defaults(\%myconfig, "invnumber");
+ }
if ($print_post) {
if (!(IS->post_invoice(\%myconfig, \%$form))) {
$form->error($locale->text('Cannot post invoice!'));