X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fio.pl;h=31322f088fa5924052512cc72f9e1c6dcfc1ac4c;hb=264b38c7465f95066b47588c2fbe85f102bd022c;hp=5cd38cd81282c53cd9c1a68cc6ec4bfe5bee242c;hpb=1d827e31101989a1ad1303fbaba5ccc827561b82;p=kivitendo-erp.git
diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 5cd38cd81..31322f088 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -202,6 +202,7 @@ sub display_row {
$serialnumber = $locale->text('Serial No.');
$projectnumber = $locale->text('Project');
$partsgroup = $locale->text('Group');
+ $reqdate = $locale->text('Reqdate');
$delvar = 'deliverydate';
@@ -396,6 +397,15 @@ sub display_row {
$projectnumber
+|;
+ if ($form->{type} eq 'invoice' or $form->{type} =~ /order/) {
+ my $reqdate_term = ($form->{type} eq 'invoice')?'deliverydate':'reqdate'; # invoice uses a different term for the same thing.
+ print qq|
+ ${$reqdate_term}
+|;
+ }
+
+ print qq|
@@ -761,39 +771,39 @@ sub display_form {
&{"$form->{display_form}"};
exit;
}
- if ( $form->{print_and_post}
- && $form->{second_run}
- && ($form->{action} eq "display_form")) {
- for (keys %$form) { $old_form->{$_} = $form->{$_} }
- $old_form->{rowcount}++;
-
- #$form->{rowcount}--;
- #$form->{rowcount}--;
-
- $form->{print_and_post} = 0;
-
- &print_form($old_form);
- exit;
- }
-
- $form->{action} = "";
- $form->{resubmit} = 0;
-
- if ($form->{print_and_post} && !$form->{second_run}) {
- $form->{second_run} = 1;
- $form->{action} = "display_form";
- $form->{rowcount}--;
- my $rowcount = $form->{rowcount};
-
- # get pricegroups for parts
- IS->get_pricegroups_for_parts(\%myconfig, \%$form);
-
- # build up html code for prices_$i
- set_pricegroup($rowcount);
-
- $form->{resubmit} = 1;
-
- }
+# if ( $form->{print_and_post}
+# && $form->{second_run}
+# && ($form->{action} eq "display_form")) {
+# for (keys %$form) { $old_form->{$_} = $form->{$_} }
+# $old_form->{rowcount}++;
+#
+# #$form->{rowcount}--;
+# #$form->{rowcount}--;
+#
+# $form->{print_and_post} = 0;
+#
+# &print_form($old_form);
+# exit;
+# }
+#
+# $form->{action} = "";
+# $form->{resubmit} = 0;
+#
+# if ($form->{print_and_post} && !$form->{second_run}) {
+# $form->{second_run} = 1;
+# $form->{action} = "display_form";
+# $form->{rowcount}--;
+# my $rowcount = $form->{rowcount};
+#
+# # get pricegroups for parts
+# IS->get_pricegroups_for_parts(\%myconfig, \%$form);
+#
+# # build up html code for prices_$i
+# set_pricegroup($rowcount);
+#
+# $form->{resubmit} = 1;
+#
+# }
&form_header;
$numrows = ++$form->{rowcount};
@@ -826,7 +836,7 @@ sub display_form {
$subroutine = "assembly_row";
}
if ($form->{item} eq 'service') {
- $numrows = ++$form->{price_rows};
+ $numrows = $form->{price_rows};
$subroutine = "price_row";
&{$subroutine}($numrows);
@@ -1251,10 +1261,10 @@ sub print_options {
$form->{copies} = 3 unless $form->{copies};
$form->{PD}{ $form->{formname} } = "selected";
- $form->{DF}{ $form->{format} } = "";
+ $form->{DF}{ $form->{format} } = "selected";
$form->{OP}{ $form->{media} } = "selected";
$form->{SM}{ $form->{sendmode} } = "selected";
-
+ print(STDERR $form->{format} , " Format\n");
if ($form->{type} eq 'purchase_order') {
$type = qq|