From cc63261c996079334c6a129d9b53d8f4a6a1e8cb Mon Sep 17 00:00:00 2001
From: Philip Reetz <p.reetz@linet-services.de>
Date: Mon, 16 Jan 2006 13:48:01 +0000
Subject: [PATCH] Druckvorschau, Drucken und Drucken+Buchen ueberarbeitet,
 Fehler bei der HTML-Vorschau beseitigt

---
 bin/mozilla/io.pl | 76 ++++++++++++++++++++++-------------------------
 bin/mozilla/is.pl | 19 +++++++-----
 bin/mozilla/oe.pl |  2 +-
 3 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index dcdaa3617..31322f088 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -771,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};
@@ -1261,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|<select name=formname>
 	    <option value=purchase_order $form->{PD}{purchase_order}>|
@@ -1413,9 +1413,7 @@ sub print_options {
 
 sub print {
   $lxdebug->enter_sub();
-  if ($form->{second_run}) {
-    $form->{print_and_post} = 0;
-  }
+
 
   # if this goes to the printer pass through
   if ($form->{media} eq 'printer' || $form->{media} eq 'queue') {
@@ -1724,8 +1722,6 @@ sub print_form {
       ? $locale->text('sent to printer')
       : $locale->text('emailed to') . " $form->{email}";
     $form->redirect(qq|$form->{label} $form->{"${inv}number"} $msg|);
-  } else {
-    &{"$display_form"};
   }
 
   $lxdebug->leave_sub();
diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 7d79ba9f2..2baf7ec06 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -57,9 +57,10 @@ sub add {
   {
     $form->error("Access Denied");
   }
-
   &invoice_links;
   &prepare_invoice;
+  $form->{format} ="pdf";
+
   &display_form;
 
   $lxdebug->leave_sub();
@@ -74,7 +75,10 @@ sub edit {
   {
     $form->error("Access Denied");
   }
-
+  if ($form->{print_and_post}) {
+    $form->{action}     = "print";
+    $form->{resubmit} = 1;
+  }
   &invoice_links;
   &prepare_invoice;
   &display_form;
@@ -187,7 +191,6 @@ sub prepare_invoice {
 
   $form->{type}     = "invoice";
   $form->{formname} = "invoice";
-  $form->{format}   = "html";
   $form->{media}    = "screen";
 
   if ($form->{id}) {
@@ -344,8 +347,10 @@ sub form_header {
     $button2 =
       qq|<td width="13"><input name=duedate size=11 title="$myconfig{dateformat}" value=$form->{duedate}></td>|;
   }
-  if ($form->{resubmit}) {
-    $onload = "document.invoice.submit()";
+  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|document.invoice.submit()|;
   } else {
     $onload = "fokus()";
   }
@@ -763,8 +768,6 @@ sub form_footer {
 <input type=hidden name=selectAR_paid value="$form->{selectAR_paid}">
 <input type=hidden name=oldinvtotal value=$form->{oldinvtotal}>
 <input type=hidden name=oldtotalpaid value=$totalpaid>
-<input type=hidden name=print_and_post value=$form->{print_and_post}>
-<input type=hidden name=second_run value=$form->{second_run}>
     </table>
     </td>
   </tr>
@@ -1092,7 +1095,7 @@ sub print_and_post {
   $form->{print_and_post} = 1;
   &post();
 
-  &display_form();
+  &edit();
   $lxdebug->leave_sub();
 
 }
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 6e33356ee..e05d0130a 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -217,7 +217,7 @@ sub order_links {
 
 sub prepare_order {
   $lxdebug->enter_sub();
-  $form->{format}   = "html";
+  $form->{format}   = "pdf";
   $form->{media}    = "screen";
   $form->{formname} = $form->{type};
 
-- 
2.20.1