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

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 0fe78fd2a..58f41f568 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';
 
@@ -254,9 +255,12 @@ sub display_row {
         qq|<td><input name="description_$i" size=30 value="$form->{"description_$i"}"></td>|;
     }
 
+    (my $qty_dec) = ($form->{"qty_$i"} =~ /\.(\d+)/);
+    $qty_dec = length $qty_dec;
+
     $column_data{qty} =
         qq|<td align=right><input name="qty_$i" size=5 value=|
-      . $form->format_amount(\%myconfig, $form->{"qty_$i"}, 0)
+      . $form->format_amount(\%myconfig, $form->{"qty_$i"}, $qty_dec)
       . qq|></td>|;
     $column_data{ship} =
         qq|<td align=right><input name="ship_$i" size=5 value=|
@@ -354,6 +358,9 @@ sub display_row {
 <input type=hidden name="listprice_$i" value="$form->{"listprice_$i"}">
 <input type=hidden name="assembly_$i" value="$form->{"assembly_$i"}">
 <input type=hidden name="taxaccounts_$i" value="$form->{"taxaccounts_$i"}">
+<input type=hidden name="ordnumber_$i" value="$form->{"ordnumber_$i"}">
+<input type=hidden name="transdate_$i" value="$form->{"transdate_$i"}">
+<input type=hidden name="cusordnumber_$i" value="$form->{"cusordnumber_$i"}">
 
 |;
 
@@ -390,6 +397,18 @@ 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>
 
@@ -419,16 +438,16 @@ 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 = $item->{price};
+
+        #$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};
 
@@ -438,20 +457,26 @@ sub set_pricegroup {
 
         $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;
         }
       }
     }
   }
-
-  #print (STDERR "HIER", Dumper($prices) );
   $lxdebug->leave_sub();
 }
 
@@ -751,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};
@@ -816,7 +842,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);
@@ -1241,7 +1267,7 @@ 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";
 
@@ -1272,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') {
@@ -1297,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');
     }
@@ -1311,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
@@ -1319,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>|;
     }
   }
 
@@ -1337,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>
@@ -1393,9 +1429,6 @@ 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') {
@@ -1528,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);
@@ -1541,7 +1574,8 @@ sub print_form {
     push @a,
       ("partnumber_$i", "description_$i",
        "partsgroup_$i", "serialnumber_$i",
-       "bin_$i",        "unit_$i");
+       "bin_$i",        "unit_$i",
+       "transdate_$i",  "ordnumber_$i");
   }
   map { push @a, "${_}_description" } split / /, $form->{taxaccounts};
 
@@ -1566,8 +1600,16 @@ sub print_form {
     IS->invoice_details(\%myconfig, \%$form, $locale);
   }
 
+  # format global dates
   map { $form->{$_} = $locale->date(\%myconfig, $form->{$_}, 1) }
-    ("${inv}date", "${due}date", "shippingdate");
+    ("${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} };
+  }
 
   @a = qw(name street zipcode city country);
 
@@ -1595,9 +1637,9 @@ 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);
+  push @a, ("${inv}date", "${due}date", "deliverydate", email, cc, bcc);
 
   $form->format_string(@a);
 
@@ -1703,8 +1745,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();