X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=31322f088fa5924052512cc72f9e1c6dcfc1ac4c;hb=e2f6b9d3965445c69b2efb2b3fd4a025b3c1b37c;hp=1a2a9c3354c47fa80508becca0799927a0146b46;hpb=5cbbffe250f165212c31f4dbfad8ca9fd7300a4a;p=kivitendo-erp.git

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 1a2a9c335..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 {
           <b>$projectnumber</b>&nbsp;<input name="projectnumber_$i" size=10 value="$form->{"projectnumber_$i"}">
 		  <input type=hidden name="oldprojectnumber_$i" value="$form->{"oldprojectnumber_$i"}">
 		  <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.
+      print qq|
+        <b>${$reqdate_term}</b>&nbsp;<input name="${reqdate_term}_$i" size=11 value="$form->{"${reqdate_term}_$i"}">
+|;
+    }
+
+    print qq|
 	  </td>
 	</tr>
 
@@ -425,15 +435,14 @@ sub set_pricegroup {
   my $rowcount = shift;
   $lxdebug->enter_sub();
   for $j (1 .. $rowcount) {
-
     my $pricegroup_old = $form->{"pricegroup_old_$i"};
     if ($form->{PRICES}{$j}) {
       $len    = 0;
       $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 = $form->round_amount($myconfig,  $item->{price}, 5);
+        #$price = $form->format_amount($myconfig, $item->{price}, 2);
         $price = $item->{price};
         $pricegroup_id = $item->{pricegroup_id};
         $pricegroup    = $item->{pricegroup};
@@ -443,20 +452,26 @@ 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);
 
         # set new selectedpricegroup_id and prices for "Preis"
-        if ($item->{selected}) {
+        if ($item->{selected} && ($pricegroup_id != 0)) {
           $form->{"pricegroup_old_$j"} = $pricegroup_id;
           $form->{"price_new_$j"}      = $price;
           $form->{"sellprice_$j"}      = $price;
         }
-        if ($len >= 1) {
+        if ($pricegroup_id == 0) {
+          $form->{"price_new_$j"} = $form->{"sellprice_$j"};
+        }
+        if ($len > 1) {
           $form->{"prices_$j"} = $prices;
         }
       }
     }
   }
-
   $lxdebug->leave_sub();
 }
 
@@ -756,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};
@@ -821,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);
@@ -1246,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}>|
@@ -1398,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') {
@@ -1601,7 +1614,7 @@ sub print_form {
 
   # some of the stuff could have umlauts so we translate them
   push @a,
-    qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptoemail shippingpoint shipvia company address signature employee contact);
+    qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptoemail shippingpoint shipvia company address signature employee contact department_1 department_2);
 
   push @a, ("${inv}date", "${due}date", email, cc, bcc);
 
@@ -1709,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();