X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=58f41f5681c6f9c2ad65bf5f430f0d5a3705b6c3;hb=d1c335e9bb0a35d45acd03b29d1e759f26c5664c;hp=03fd32ace1d82cfcf155af50881ca0c3aa2e90ca;hpb=8d19aa002666b22761822ba2fdc8be4ee204c5f1;p=kivitendo-erp.git

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 03fd32ace..58f41f568 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -399,7 +399,10 @@ sub display_row {
 		  <input type=hidden name="project_id_$i" value="$form->{"project_id_$i"}">
 |;
     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.
+      my $reqdate_term =
+        ($form->{type} eq 'invoice')
+        ? 'deliverydate'
+        : 'reqdate';    # invoice uses a different term for the same thing.
       print qq|
         <b>${$reqdate_term}</b>&nbsp;<input name="${reqdate_term}_$i" size=11 value="$form->{"${reqdate_term}_$i"}">
 |;
@@ -441,9 +444,10 @@ sub set_pricegroup {
       $prices = '';
       $price  = 0;
       foreach $item (@{ $form->{PRICES}{$j} }) {
+
         #$price = $form->round_amount($myconfig,  $item->{price}, 5);
         #$price = $form->format_amount($myconfig, $item->{price}, 2);
-        $price = $item->{price};
+        $price         = $item->{price};
         $pricegroup_id = $item->{pricegroup_id};
         $pricegroup    = $item->{pricegroup};
 
@@ -452,10 +456,11 @@ sub set_pricegroup {
           qq|<option value="$price--$pricegroup_id"$item->{selected}>$pricegroup</option>\n|;
 
         $len += 1;
-#        map {
-#               $form->{"${_}_$j"} =
-#               $form->format_amount(\%myconfig, $form->{"${_}_$j"})
-#              } qw(sellprice price_new price_old);
+
+        #        map {
+        #               $form->{"${_}_$j"} =
+        #               $form->format_amount(\%myconfig, $form->{"${_}_$j"})
+        #              } qw(sellprice price_new price_old);
 
         # set new selectedpricegroup_id and prices for "Preis"
         if ($item->{selected} && ($pricegroup_id != 0)) {
@@ -771,39 +776,40 @@ 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};
@@ -1264,7 +1270,7 @@ sub print_options {
   $form->{DF}{ $form->{format} }   = "selected";
   $form->{OP}{ $form->{media} }    = "selected";
   $form->{SM}{ $form->{sendmode} } = "selected";
-  
+
   if ($form->{type} eq 'purchase_order') {
     $type = qq|<select name=formname>
 	    <option value=purchase_order $form->{PD}{purchase_order}>|
@@ -1292,7 +1298,10 @@ sub print_options {
 
   if ($form->{type} eq 'invoice') {
     $type = qq|<select name=formname>
-	    <option value=invoice $form->{PD}{invoice}>| . $locale->text('Invoice');
+	    <option value=invoice $form->{PD}{invoice}>|
+      . $locale->text('Invoice') . qq|
+      <option value=packing_list $form->{PD}{packing_list}>|
+      . $locale->text('Packing List');
   }
 
   if ($form->{type} eq 'ship_order') {
@@ -1317,12 +1326,12 @@ sub print_options {
   } else {
     $media = qq|<select name=media>
 	    <option value=screen $form->{OP}{screen}>| . $locale->text('Screen');
-    if ($myconfig{printer} && $latex) {
+    if ($myconfig{printer} && $latex_templates) {
       $media .= qq|
             <option value=printer $form->{OP}{printer}>|
         . $locale->text('Printer');
     }
-    if ($latex) {
+    if ($latex_templates) {
       $media .= qq|
             <option value=queue $form->{OP}{queue}>| . $locale->text('Queue');
     }
@@ -1331,7 +1340,7 @@ sub print_options {
   $format = qq|<select name=format>
             <option value=html $form->{DF}{html}>html|;
 
-  if ($latex) {
+  if ($latex_templates) {
     $format = qq|<select name=format>
             <option value=pdf $form->{DF}{pdf}>| . $locale->text('PDF') . qq|
             <option value=html $form->{DF}{html}>html
@@ -1339,14 +1348,21 @@ sub print_options {
       . $locale->text('Postscript');
   }
 
-  $language = qq|<select name=language>
+  $format .= qq|<option value=html $form->{DF}{html}>HTML</option>|;
+
+  if ($latex_templates) {
+    $format .= qq|<option value=postscript $form->{DF}{postscript}>| .
+      $locale->text('Postscript') . qq|</option>|;
+  }
+
+  $language_select = qq|<select name=language>
                  <option value=""></option>|;
   %lang = (de => "deutsch", en => "englisch", fr => "französisch");
   foreach $item (keys %lang) {
     if ($form->{language} eq $item) {
-      $language .= qq|<option value="$item" selected>$lang{$item}</option>|;
+      $language_select .= qq|<option value="$item" selected>$lang{$item}</option>|;
     } else {
-      $language .= qq|<option value="$item">$lang{$item}</option>|;
+      $language_select .= qq|<option value="$item">$lang{$item}</option>|;
     }
   }
 
@@ -1357,12 +1373,12 @@ sub print_options {
       <table>
 	<tr>
 	  <td>$type</select></td>
-          <td>$language</select</td>
+          <td>${language_select}</select></td>
 	  <td>$format</select></td>
 	  <td>$media</select></td>
 |;
 
-  if ($myconfig{printer} && $latex && $form->{media} ne 'email') {
+  if ($myconfig{printer} && $latex_templates && $form->{media} ne 'email') {
     print qq|
 	  <td>| . $locale->text('Copies') . qq|
 	  <input name=copies size=2 value=$form->{copies}></td>
@@ -1414,7 +1430,6 @@ sub print_options {
 sub print {
   $lxdebug->enter_sub();
 
-
   # if this goes to the printer pass through
   if ($form->{media} eq 'printer' || $form->{media} eq 'queue') {
     $form->error($locale->text('Select postscript or PDF!'))
@@ -1546,9 +1561,9 @@ sub print_form {
   my ($saved_email, $saved_cc, $saved_bcc) =
     ($form->{"email"}, $form->{"cc"}, $form->{"bcc"});
 
-  $language = $form->{language};
+  $language_saved = $form->{language};
   &{"$form->{vc}_details"};
-  $form->{language} = $language;
+  $form->{language} = $language_saved;
 
   $form->{"email"} = $saved_email if ($saved_email);
   $form->{"cc"}    = $saved_cc    if ($saved_cc);
@@ -1585,15 +1600,15 @@ sub print_form {
     IS->invoice_details(\%myconfig, \%$form, $locale);
   }
 
-  # format global dates 
+  # format global dates
   map { $form->{$_} = $locale->date(\%myconfig, $form->{$_}, 1) }
     ("${inv}date", "${due}date", "shippingdate", "deliverydate");
 
   # format item dates
   for my $field (qw(transdate_oe deliverydate_oe)) {
-    map { 
-      $form->{$field}[$_] = $locale->date(\%myconfig, $form->{$field}[$_], 1); 
-    } 0..$#{$form->{$field}};
+    map {
+      $form->{$field}[$_] = $locale->date(\%myconfig, $form->{$field}[$_], 1);
+    } 0 .. $#{ $form->{$field} };
   }
 
   @a = qw(name street zipcode city country);