X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=c7d7b694a5ae1e54783876cb1ce11052fab70987;hb=101a5e1f45b26386025a130be304a333ee8b64b7;hp=38122539247047672284fa176054a563572ab431;hpb=bdb99b0def840cdd81b19bfbe68e1b383ae1c8cc;p=kivitendo-erp.git

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 381225392..c7d7b694a 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -74,6 +74,7 @@ if (-f "$form->{path}/$form->{login}_io.pl") {
 # $locale->text('Dec')
 use SL::IS;
 use SL::PE;
+use SL::AM;
 use Data::Dumper;
 ########################################
 # Eintrag fuer Version 2.2.0 geaendert #
@@ -100,6 +101,10 @@ sub display_row {
   }
 ############## ENDE Neueintrag ##################
 
+  my $dimension_units = AM->retrieve_units(\%myconfig, $form, "dimension");
+  my $service_units = AM->retrieve_units(\%myconfig, $form, "service");
+  my $all_units = AM->retrieve_units(\%myconfig, $form);
+
   push @column_index, qw(unit);
 
   #for pricegroups column
@@ -107,7 +112,7 @@ sub display_row {
       or (($form->{level} =~ /Sales/) and ($form->{type} =~ /invoice/))
       or (($form->{level} eq undef) and ($form->{type} =~ /invoice/))
       or ($form->{type} =~ /sales_order/)) {
-    push @column_index, qw(sellprice_drag);
+    push @column_index, qw(sellprice_pg);
   }
 
   push @column_index, qw(sellprice);
@@ -167,7 +172,7 @@ sub display_row {
       qq|<th align=left nowrap width=15 class=listheading>|
     . $locale->text('Price')
     . qq|</th>|;
-  $column_data{sellprice_drag} =
+  $column_data{sellprice_pg} =
       qq|<th align=left nowrap width=15 class=listheading>|
     . $locale->text('Pricegroup')
     . qq|</th>|;
@@ -217,8 +222,42 @@ sub display_row {
     map {
       $form->{"${_}_$i"} =
         $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
-    } qw(qty ship discount sellprice price_new price_old);
+    } qw(qty ship discount sellprice price_new price_old) unless ($form->{simple_save});
+
+    if (!$form->{"unit_old_$i"}) {
+      # Neue Ware aus der Datenbank. In diesem Fall ist unit_$i die
+      # Einheit, wie sie in den Stammdaten hinterlegt wurde.
+      # Es sollte also angenommen werden, dass diese ausgewaehlt war.
+      $form->{"unit_old_$i"} = $form->{"unit_$i"};
+    }
+
 
+
+    # Die zuletzt ausgewaehlte mit der aktuell ausgewaehlten Einheit
+    # vergleichen und bei Unterschied den Preis entsprechend umrechnen.
+    $form->{"selected_unit_$i"} = $form->{"unit_$i"} unless ($form->{"selected_unit_$i"});
+
+    my $check_units = $form->{"inventory_accno_$i"} ? $dimension_units : $service_units;
+    if (!$check_units->{$form->{"selected_unit_$i"}} ||
+        ($check_units->{$form->{"selected_unit_$i"}}->{"base_unit"} ne
+         $all_units->{$form->{"unit_old_$i"}}->{"base_unit"})) {
+      # Die ausgewaehlte Einheit ist fuer diesen Artikel nicht gueltig
+      # (z.B. Dimensionseinheit war ausgewaehlt, es handelt sich aber
+      # um eine Dienstleistung). Dann keinerlei Umrechnung vornehmen.
+      $form->{"unit_old_$i"} = $form->{"selected_unit_$i"} = $form->{"unit_$i"};
+    }
+    if ((!$form->{"prices_$i"}) || ($form->{"new_pricegroup_$i"} == $form->{"old_pricegroup_$i"})) {
+      if ($form->{"unit_old_$i"} ne $form->{"selected_unit_$i"}) {
+        my $basefactor = 1;
+        if (defined($all_units->{$form->{"unit_old_$i"}}->{"factor"}) &&
+            $all_units->{$form->{"unit_old_$i"}}->{"factor"}) {
+          $basefactor = $all_units->{$form->{"selected_unit_$i"}}->{"factor"} /
+            $all_units->{$form->{"unit_old_$i"}}->{"factor"};
+        }
+        $form->{"sellprice_$i"} *= $basefactor;
+        $form->{"unit_old_$i"} = $form->{"selected_unit_$i"};
+      }
+    }
     ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/);
     $dec           = length $dec;
     $decimalplaces = ($dec > 2) ? $dec : 2;
@@ -234,7 +273,7 @@ sub display_row {
 
     # convert " to &quot;
     map { $form->{"${_}_$i"} =~ s/\"/&quot;/g }
-      qw(partnumber description unit);
+      qw(partnumber description unit unit_old);
 
 ########################################
     # Eintrag fuer Version 2.2.0 geaendert #
@@ -249,10 +288,10 @@ sub display_row {
 
     if (($rows = $form->numtextrows($form->{"description_$i"}, 30, 6)) > 1) {
       $column_data{description} =
-        qq|<td><textarea name="description_$i" rows=$rows cols=30 wrap=soft>$form->{"description_$i"}</textarea></td>|;
+        qq|<td><textarea name="description_$i" rows=$rows cols=30 wrap=soft>$form->{"description_$i"}</textarea><button type="button" onclick="set_longdescription_window('longdescription_$i')">| . $locale->text('L') . qq|</button></td>|;
     } else {
       $column_data{description} =
-        qq|<td><input name="description_$i" size=30 value="$form->{"description_$i"}"></td>|;
+        qq|<td><input name="description_$i" size=30 value="$form->{"description_$i"}"><button type="button" onclick="set_longdescription_window('longdescription_$i')">| . $locale->text('L') . qq|</button></td>|;
     }
 
     (my $qty_dec) = ($form->{"qty_$i"} =~ /\.(\d+)/);
@@ -260,49 +299,69 @@ sub display_row {
 
     $column_data{qty} =
         qq|<td align=right><input name="qty_$i" size=5 value=|
-      . $form->format_amount(\%myconfig, $form->{"qty_$i"}, $qty_dec)
-      . qq|></td>|;
+      . $form->format_amount(\%myconfig, $form->{"qty_$i"}, $qty_dec) .qq|>|;
+    if ($form->{"formel_$i"}) {
+    $column_data{qty} .= qq|<button type="button" onclick="calculate_qty_selection_window('qty_$i','alu_$i', 'formel_$i', $i)">| . $locale->text('*/') . qq|</button>
+          <input type=hidden name="formel_$i" value="$form->{"formel_$i"}"><input type=hidden name="alu_$i" value="$form->{"alu_$i"}"></td>|;
+    }
     $column_data{ship} =
         qq|<td align=right><input name="ship_$i" size=5 value=|
       . $form->format_amount(\%myconfig, $form->{"ship_$i"})
       . qq|></td>|;
-    $column_data{unit} =
-      qq|<td><input name="unit_$i" size=5 value="$form->{"unit_$i"}"></td>|;
 
-    # build in dragdrop for pricesgroups
+    my $is_part = $form->{"inventory_accno_$i"};
+    my $is_assigned = $form->{"id_$i"};
+    my $this_unit = $form->{"unit_$i"};
+    if ($form->{"selected_unit_$i"} && $this_unit &&
+        $all_units->{$form->{"selected_unit_$i"}} && $all_units->{$this_unit} &&
+        ($all_units->{$form->{"selected_unit_$i"}}->{"base_unit"} eq $all_units->{$this_unit}->{"base_unit"})) {
+      $this_unit = $form->{"selected_unit_$i"};
+    } elsif (!$is_assigned ||
+             ($is_part && !$this_unit && ($all_units->{$this_unit} && ($all_units->{$this_unit}->{"base_unit"} eq $all_units->{"kg"}->{"base_unit"})))) {
+      $this_unit = "kg";
+    }
+
+    $column_data{"unit"} = "<td>" .
+      ($qty_readonly ? "&nbsp;" :
+       AM->unit_select_html($is_part ? $dimension_units :
+                            $is_assigned ? $service_units : $all_units,
+                            "unit_$i", $this_unit,
+                            $is_assigned ? $form->{"unit_$i"} : undef))
+      . "</td>";
+
+    # build in drop down list for pricesgroups
     if ($form->{"prices_$i"}) {
-      $price_tmp =
-        $form->format_amount(\%myconfig, $form->{"price_new_$i"}, 2);
+      if  ($form->{"new_pricegroup_$i"} != $form->{"old_pricegroup_$i"}) {
+        $price_tmp = $form->format_amount(\%myconfig, $form->{"price_new_$i"}, $decimalplaces);
+      } else {
+        $price_tmp = $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces);
+      }
 
-      $column_data{sellprice_drag} =
-        qq|<td align=right><select name="sellprice_drag_$i">$form->{"prices_$i"}</select></td>|;
+      $column_data{sellprice_pg} =
+        qq|<td align=right><select name="sellprice_pg_$i">$form->{"prices_$i"}</select></td>|;
       $column_data{sellprice} =
-        qq|<td><input name="sellprice_$i" size=5 value=$price_tmp></td>|;
+        qq|<td><input name="sellprice_$i" size=10 value=$price_tmp></td>|;
     } else {
 
       # for last row and report
-      # set pricegroup dragdrop from report menu
+      # set pricegroup drop down list from report menu
       if ($form->{"sellprice_$i"} != 0) {
         $prices =
           qq|<option value="$form->{"sellprice_$i"}--$form->{"pricegroup_id_$i"}" selected>$form->{"pricegroup_$i"}</option>\n|;
 
         $form->{"pricegroup_old_$i"} = $form->{"pricegroup_id_$i"};
 
-        $column_data{sellprice_drag} =
-          qq|<td align=right><select name="sellprice_drag_$i">$prices</select></td>|;
+        $column_data{sellprice_pg} =
+          qq|<td align=right><select name="sellprice_pg_$i">$prices</select></td>|;
 
       } else {
 
         # for last row
-        $column_data{sellprice_drag} =
-          qq|<td align=right><input name="sellprice_$i" size=9 value=|
-          . $form->format_amount(\%myconfig, $form->{"prices_$i"},
-                                 $decimalplaces)
-          . qq|></td>|;
+        $column_data{sellprice_pg} = qq|<td align=right>&nbsp;</td>|;
       }
 
       $column_data{sellprice} =
-        qq|<td><input name="sellprice_$i" size=5 value=|
+        qq|<td><input name="sellprice_$i" size=10 value=|
         . $form->format_amount(\%myconfig, $form->{"sellprice_$i"},
                                $decimalplaces)
         . qq|></td>|;
@@ -331,9 +390,10 @@ sub display_row {
     #
     #     $column_data{projectnr} = qq|<td><input name="projectnumber_$i" size=10 value="$form->{"projectnumber_$i"}"></td>|;
 ############## ENDE Neueintrag ##################
-
+    my $j = $i % 2;
     print qq|
-        <tr valign=top>|;
+
+        <tr valign=top class=listrow$j>|;
 
     map { print "\n$column_data{$_}" } @column_index;
 
@@ -345,6 +405,7 @@ sub display_row {
 
 <input type=hidden name="pricegroup_old_$i" value=$form->{"pricegroup_old_$i"}>
 <input type=hidden name="price_old_$i" value=$form->{"price_old_$i"}>
+<input type=hidden name="unit_old_$i" value="$form->{"selected_unit_$i"}">
 <input type=hidden name="price_new_$i" value=|
       . $form->format_amount(\%myconfig, $form->{"price_new_$i"}) . qq|>
 
@@ -361,6 +422,9 @@ sub display_row {
 <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"}">
+<input type=hidden name="longdescription_$i" value="$form->{"longdescription_$i"}">
+<input type=hidden name="basefactor_$i" value="$form->{"basefactor_$i"}">
+<input type=hidden name="adr_description_$i" value="$form->{"adr_description_$i"}">
 
 |;
 
@@ -370,7 +434,7 @@ sub display_row {
 ########################################
     # print second row
     print qq|
-        <tr>
+        <tr  class=listrow$j>
 	  <td colspan=$colspan>
 |;
     if ($lizenzen && $form->{type} eq "invoice" && $form->{vc} eq "customer") {
@@ -399,17 +463,21 @@ 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"}">
 |;
-
+    }
+    my $subtotalchecked = ($form->{"subtotal_$i"}) ? "checked" : "";
     print qq|
+          <b>|.$locale->text('Subtotal').qq|</b>&nbsp;<input type="checkbox" name="subtotal_$i" value="1" "$subtotalchecked">
 	  </td>
 	</tr>
 
 |;
-    }
 
 ############## ENDE Neueintrag ##################
 
@@ -432,30 +500,32 @@ sub display_row {
 # build html-code for pricegroups in variable $form->{prices_$j}
 
 sub set_pricegroup {
-  my $rowcount = shift;
   $lxdebug->enter_sub();
+  my $rowcount = shift;
   for $j (1 .. $rowcount) {
     my $pricegroup_old = $form->{"pricegroup_old_$i"};
     if ($form->{PRICES}{$j}) {
       $len    = 0;
-      $prices = '';
+      $prices = '<option value="--">' . $locale->text("none (pricegroup)") . '</option>';
       $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};
 
-        # build dragdrop for pricegroups
+        # build drop down list for pricegroups
         $prices .=
           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)) {
@@ -466,10 +536,8 @@ sub set_pricegroup {
         if ($pricegroup_id == 0) {
           $form->{"price_new_$j"} = $form->{"sellprice_$j"};
         }
-        if ($len > 1) {
-          $form->{"prices_$j"} = $prices;
-        }
       }
+      $form->{"prices_$j"} = $prices;
     }
   }
   $lxdebug->leave_sub();
@@ -567,6 +635,12 @@ sub select_item {
 <input name="new_assembly_$i" type=hidden value="$ref->{assembly}">
 <input name="new_taxaccounts_$i" type=hidden value="$ref->{taxaccounts}">
 <input name="new_partsgroup_$i" type=hidden value="$ref->{partsgroup}">
+<input name="new_formel_$i" type=hidden value="$ref->{formel}">
+<input name="new_alu_$i" type=hidden value="$ref->{alu}">
+<input name="new_longdescription_$i" type=hidden value="$ref->{longdescription}">
+<input name="new_not_discountable_$i" type=hidden value="$ref->{not_discountable}">
+<input name="new_part_payment_id_$i" type=hidden value="$ref->{part_payment_id}">
+<input name="new_adr_description_$i" type=hidden value="$ref->{adr_description}">
 
 <input name="new_id_$i" type=hidden value=$ref->{id}>
 
@@ -629,7 +703,10 @@ sub item_selected {
   $sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"});
 
   map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} }
-    qw(id partnumber description sellprice listprice inventory_accno income_accno expense_accno bin unit weight assembly taxaccounts partsgroup);
+    qw(id partnumber description sellprice listprice inventory_accno income_accno expense_accno bin unit weight assembly taxaccounts partsgroup formel alu longdescription not_discountable adr_description);
+  if ($form->{"part_payment_id_$i"} ne "") {
+    $form->{payment_id} = $form->{"part_payment_id_$i"};
+  }
 
   if ($lizenzen) {
     map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} } qw(lizenzen);
@@ -656,6 +733,10 @@ sub item_selected {
 
   $form->{sellprice} += ($form->{"sellprice_$i"} * $form->{"qty_$i"});
   $form->{weight}    += ($form->{"weight_$i"} * $form->{"qty_$i"});
+  
+  if ($form->{"not_discountable_$i"}) {
+    $form->{"discount_$i"} = 0;
+  }
 
   $amount =
     $form->{"sellprice_$i"} * (1 - $form->{"discount_$i"} / 100) *
@@ -765,45 +846,47 @@ sub new_item {
 
 sub display_form {
   $lxdebug->enter_sub();
+  $form->language_payment(\%myconfig);
 
   # if we have a display_form
   if ($form->{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 +904,7 @@ sub display_form {
     $subroutine = "makemodel_row";
   }
   if ($form->{item} eq 'assembly') {
-    $numrows    = ++$form->{price_rows};
+    $numrows    = $form->{price_rows};
     $subroutine = "price_row";
 
     &{$subroutine}($numrows);
@@ -836,7 +919,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);
@@ -857,9 +940,10 @@ sub check_form {
   my @a     = ();
   my $count = 0;
   my @flds  = (
-    qw(id partnumber description qty ship sellprice unit discount inventory_accno income_accno expense_accno listprice taxaccounts bin assembly weight projectnumber project_id oldprojectnumber runningnumber serialnumber partsgroup)
+    qw(id partnumber description qty ship sellprice unit discount inventory_accno income_accno expense_accno listprice taxaccounts bin assembly weight projectnumber project_id oldprojectnumber runningnumber serialnumber partsgroup payment_id not_discountable shop ve gv buchungsgruppen_id adr_id language_values)
   );
 
+
   # remove any makes or model rows
   if ($form->{item} eq 'part') {
     map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
@@ -1058,7 +1142,6 @@ sub order {
 
   $form->{rowcount}--;
 
-  ($null, $form->{cp_id}) = split /--/, $form->{contact};
   $form->{cp_id} *= 1;
 
   require "$form->{path}/$form->{script}";
@@ -1106,7 +1189,6 @@ sub quotation {
     $buysell       = 'buy';
   }
 
-  ($null, $form->{cp_id}) = split /--/, $form->{contact};
   $form->{cp_id} *= 1;
 
   $form->{script} = 'oe.pl';
@@ -1261,7 +1343,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";
 
@@ -1273,26 +1355,57 @@ sub print_options {
       . $locale->text('Bin List');
   }
 
+  if ($form->{type} eq 'credit_note') {
+    $type = qq|<select name=formname>
+	    <option value=credit_note $form->{PD}{credit_note}>|
+      . $locale->text('Credit Note');
+  }
+
   if ($form->{type} eq 'sales_order') {
     $type = qq|<select name=formname>
 	    <option value=sales_order $form->{PD}{sales_order}>|
       . $locale->text('Confirmation') . qq|
+      <option value=proforma $form->{PD}{proforma}>|
+      . $locale->text('Proforma Invoice') . qq|
 	    <option value=pick_list $form->{PD}{pick_list}>|
       . $locale->text('Pick List') . qq|
 	    <option value=packing_list $form->{PD}{packing_list}>|
-      . $locale->text('Packing List');
+      . $locale->text('Packing List') . qq|
+	    <option value=agb $form->{PD}{agb}>|
+      . $locale->text('AGB') . qq|
+	    <option value=bunker_receipt $form->{PD}{bunker_receipt}>|
+      . $locale->text('Bunker Receipt');
   }
 
   if ($form->{type} =~ /_quotation$/) {
     $type = qq|<select name=formname>
 	    <option value="$`_quotation" $form->{PD}{"$`_quotation"}>|
-      . $locale->text('Quotation') . qq|
-|;
+      . $locale->text('Quotation')
+;
   }
 
   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=proforma $form->{PD}{proforma}>|
+      . $locale->text('Proforma Invoice') . qq|
+      <option value=packing_list $form->{PD}{packing_list}>|
+      . $locale->text('Packing List');
+  }
+
+  if ($form->{type} eq 'invoice' && $form->{storno}) {
+    $type = qq|<select name=formname>
+	    <option value=storno_invoice $form->{PD}{storno_invoice}>|
+      . $locale->text('Storno Invoice') . qq|
+      <option value=storno_packing_list $form->{PD}{storno_packing_list}>|
+      . $locale->text('Storno Packing List');
+  }
+
+  if ($form->{type} eq 'credit_note') {
+    $type = qq|<select name=formname>
+	    <option value=credit_note $form->{PD}{credit_note}>|
+      . $locale->text('Credit Note');
   }
 
   if ($form->{type} eq 'ship_order') {
@@ -1317,52 +1430,87 @@ sub print_options {
   } else {
     $media = qq|<select name=media>
 	    <option value=screen $form->{OP}{screen}>| . $locale->text('Screen');
-    if ($myconfig{printer} && $latex) {
+    if (scalar(keys (%{ $form->{printers} })) !=0 && $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');
     }
   }
 
-  $format = qq|<select name=format>
-            <option value=html $form->{DF}{html}>html|;
+  $format = qq|<select name=format>|;
+  if ($opendocument_templates && $openofficeorg_writer_bin &&
+      $xvfb_bin && (-x $openofficeorg_writer_bin) && (-x $xvfb_bin)) {
+    $format .= qq|<option value=opendocument_pdf | .
+      $form->{DF}{"opendocument_pdf"} . qq|>| .
+      $locale->text("PDF (OpenDocument/OASIS)") . qq|</option>|;
+  }
+
+  if ($latex_templates) {
+    $format .= qq|<option value=pdf $form->{DF}{pdf}>| .
+      $locale->text('PDF') . qq|</option>|;
+  }
+
+  $format .= qq|<option value=html $form->{DF}{html}>HTML</option>|;
 
   if ($latex) {
-    $format = qq|<select name=format>
-            <option value=pdf $form->{DF}{pdf}>| . $locale->text('PDF') . qq|
-            <option value=html $form->{DF}{html}>html
-            <option value=postscript $form->{DF}{postscript}>|
-      . $locale->text('Postscript');
-  }
-
-  $language = 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>|;
-    } else {
-      $language .= qq|<option value="$item">$lang{$item}</option>|;
+    $format .= qq|<option value=postscript $form->{DF}{postscript}>| .
+      $locale->text('Postscript') . qq|</option>|;
+  }
+
+  if ($opendocument_templates) {
+    $format .= qq|<option value=opendocument $form->{DF}{opendocument}>| .
+      $locale->text("OpenDocument/OASIS") . qq|</option>|;
+  }
+  $format .= qq|</select>|;
+
+  if (scalar(keys (%{ $form->{languages} })) !=0) {
+
+    $language_select = qq|<select name=language_id>|;
+    foreach $item (@{ $form->{languages} }) {
+      if ($form->{language_id} eq $item->{id}) {
+        $language_select .= qq|<option value="$item->{id}" selected>$item->{description}</option>|;
+      } else {
+        $language_select .= qq|<option value="$item->{id}">$item->{description}</option>|;
+      }
     }
   }
 
+  if (scalar(keys (%{ $form->{printers} })) !=0) {
+
+    $printer_select = qq|<select name=printer_id>
+                  <option value=""></option>|;
+    foreach $item (@{ $form->{printers} }) {
+      $printer_select .= qq|<option value="$item->{id}">$item->{printer_description}</option>|;
+    }
+  }
+
+
+
   print qq|
 <table width=100% cellspacing=0 cellpadding=0>
   <tr>
     <td>
       <table>
 	<tr>
-	  <td>$type</select></td>
-          <td>$language</select</td>
+	  <td>$type</select></td>|;
+  if (scalar(keys (%{ $form->{languages} })) !=0) {
+  print qq|
+          <td>${language_select}</select></td>|;
+  }
+  print qq|
 	  <td>$format</select></td>
-	  <td>$media</select></td>
+	  <td>$media</select></td>|;
+  if (scalar(keys (%{ $form->{printers} })) !=0) {
+  print qq|
+	  <td>$printer_select</select></td>
 |;
+  }
 
-  if ($myconfig{printer} && $latex && $form->{media} ne 'email') {
+  if (scalar(keys (%{ $form->{printers} })) !=0 && $latex_templates && $form->{media} ne 'email') {
     print qq|
 	  <td>| . $locale->text('Copies') . qq|
 	  <input name=copies size=2 value=$form->{copies}></td>
@@ -1413,9 +1561,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') {
@@ -1426,6 +1571,18 @@ sub print {
     map { $old_form->{$_} = $form->{$_} } keys %$form;
   }
 
+  if (!$form->{id} || (($form->{formname} eq "proforma") && !$form->{proforma} && (($form->{type} =~ /_order$/) || ($form->{type} =~ /_quotation$/)))) {
+    if ($form->{formname} eq "proforma") {
+      $form->{proforma} = 1;
+    }
+    $form->{print_and_save} = 1;
+    my $formname = $form->{formname};
+    &save();
+    $form->{formname} = $formname;
+    &edit();
+    exit;
+  }
+
   &print_form($old_form);
 
   $lxdebug->leave_sub();
@@ -1453,7 +1610,7 @@ sub print_form {
     # this is from an invoice
     $form->{label} = $locale->text('Packing List');
   }
-  if ($form->{formname} eq 'sales_order') {
+  if (($form->{formname} eq 'sales_order') || ($form->{formname} eq 'agb') || ($form->{formname} eq 'bunker_receipt')) {
     $inv                  = "ord";
     $due                  = "req";
     $form->{"${inv}date"} = $form->{transdate};
@@ -1461,6 +1618,28 @@ sub print_form {
     $numberfld            = "sonumber";
     $order                = 1;
   }
+
+  if (($form->{type} eq 'invoice') && ($form->{formname} eq 'proforma') ) {
+    $inv                  = "inv";
+    $due                  = "due";
+    $form->{"${inv}date"} = $form->{transdate};
+    $form->{"invdate"}    = $form->{transdate};
+    $form->{label}        = $locale->text('Proforma Invoice');
+    $numberfld            = "sonumber";
+    $order                = 0;
+  }
+
+  if (($form->{type} eq 'sales_order') && ($form->{formname} eq 'proforma') ) {
+    $inv                  = "inv";
+    $due                  = "due";
+    $form->{"${inv}date"} = $form->{transdate};
+    $form->{"invdate"}    = $form->{transdate};
+    $form->{invnumber}    = $form->{ordnumber};
+    $form->{label}        = $locale->text('Proforma Invoice');
+    $numberfld            = "sonumber";
+    $order                = 1;
+  }
+
   if ($form->{formname} eq 'packing_list' && $form->{type} ne 'invoice') {
 
     # we use the same packing list as from an invoice
@@ -1469,6 +1648,8 @@ sub print_form {
     $form->{invdate} = $form->{"${inv}date"} = $form->{transdate};
     $form->{label} = $locale->text('Packing List');
     $order = 1;
+    # set invnumber for template packing_list 
+    $form->{invnumber}   = $form->{ordnumber};
   }
   if ($form->{formname} eq 'pick_list') {
     $inv                  = "ord";
@@ -1501,6 +1682,17 @@ sub print_form {
     $numberfld            = "sqnumber";
     $order                = 1;
   }
+
+  if (($form->{type} eq 'sales_quotation') && ($form->{formname} eq 'proforma') ) {
+    $inv                  = "quo";
+    $due                  = "req";
+    $form->{"${inv}date"} = $form->{transdate};
+    $form->{"invdate"} = $form->{transdate};
+    $form->{label}        = $locale->text('Proforma Invoice');
+    $numberfld            = "sqnumber";
+    $order                = 1;
+  }
+
   if ($form->{formname} eq 'request_quotation') {
     $inv                  = "quo";
     $due                  = "req";
@@ -1548,35 +1740,19 @@ sub print_form {
   my ($saved_email, $saved_cc, $saved_bcc) =
     ($form->{"email"}, $form->{"cc"}, $form->{"bcc"});
 
-  $language = $form->{language};
+  $language_saved = $form->{language_id};
   &{"$form->{vc}_details"};
-  $form->{language} = $language;
+  $form->{language_id} = $language_saved;
 
   $form->{"email"} = $saved_email if ($saved_email);
   $form->{"cc"}    = $saved_cc    if ($saved_cc);
   $form->{"bcc"}   = $saved_bcc   if ($saved_bcc);
 
-  @a = ();
-  foreach $i (1 .. $form->{rowcount}) {
-    push @a,
-      ("partnumber_$i", "description_$i",
-       "partsgroup_$i", "serialnumber_$i",
-       "bin_$i",        "unit_$i",
-       "transdate_$i",  "ordnumber_$i");
-  }
-  map { push @a, "${_}_description" } split / /, $form->{taxaccounts};
-
-  $ARAP = ($form->{vc} eq 'customer') ? "AR" : "AP";
-  push @a, $ARAP;
-
   # format payment dates
   for $i (1 .. $form->{paidaccounts} - 1) {
     $form->{"datepaid_$i"} = $locale->date(\%myconfig, $form->{"datepaid_$i"});
-    push @a, "${ARAP}_paid_$i", "source_$i", "memo_$i";
   }
 
-  $form->format_string(@a);
-
   ($form->{employee}) = split /--/, $form->{employee};
   ($form->{warehouse}, $form->{warehouse_id}) = split /--/, $form->{warehouse};
 
@@ -1587,8 +1763,20 @@ 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} };
+  }
+
+  if ($form->{shipto_id}) {
+    $form->get_shipto(\%myconfig);
+  }
 
   @a = qw(name street zipcode city country);
 
@@ -1614,31 +1802,39 @@ sub print_form {
 
   $form->{notes} =~ s/^\s+//g;
 
-  # 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 department_1 department_2);
+  map({ $form->{$_} =~ s/\\n/\n/g; } qw(company address));
 
-  push @a, ("${inv}date", "${due}date", email, cc, bcc);
+  $form->{templates} = "$myconfig{templates}";
 
-  $form->format_string(@a);
+  $form->{language} = $form->get_template_language(\%myconfig);
+  $form->{printer_code} = $form->get_printer_code(\%myconfig);
 
-  $form->{templates} = "$myconfig{templates}";
   if ($form->{language} ne "") {
     $form->{language} = "_" . $form->{language};
   }
 
-  $form->{IN} = "$form->{formname}$form->{language}.html";
+  if ($form->{printer_code} ne "") {
+    $form->{printer_code} = "_" . $form->{printer_code};
+  }
+
+  $form->{IN} = "$form->{formname}$form->{language}$form->{printer_code}.html";
   if ($form->{format} eq 'postscript') {
     $form->{postscript} = 1;
     $form->{IN} =~ s/html$/tex/;
-  }
-  if ($form->{format} eq 'pdf') {
+  } elsif ($form->{"format"} =~ /pdf/) {
     $form->{pdf} = 1;
-    $form->{IN} =~ s/html$/tex/;
+    if ($form->{"format"} =~ /opendocument/) {
+      $form->{IN} =~ s/html$/odt/;
+    } else {
+      $form->{IN} =~ s/html$/tex/;
+    }
+  } elsif ($form->{"format"} =~ /opendocument/) {
+    $form->{"opendocument"} = 1;
+    $form->{"IN"} =~ s/html$/odt/;
   }
 
   if ($form->{media} eq 'printer') {
-    $form->{OUT} = "| $myconfig{printer}";
+    $form->{OUT} = "| $form->{printer_command} &>/dev/null";
     $form->{printed} .= " $form->{formname}";
     $form->{printed} =~ s/^ //;
   }
@@ -1724,8 +1920,10 @@ 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"};
+  }
+  if ($form->{printing}) {
+   &{"$display_form"};
+   exit; 
   }
 
   $lxdebug->leave_sub();