X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=7643f14f145928290a17b597959e3aa26e206ae8;hb=52352135ee322387c8eba0fcbbb09dd50abbdf09;hp=22acf9710aa8d3f1feba7119649e7cea25252cbe;hpb=9f0d85c2b00a0d3b7a92b63115801b2452846470;p=kivitendo-erp.git

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 22acf9710..039509269 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -33,12 +33,22 @@
 #
 #######################################################################
 
+use CGI;
+use CGI::Ajax;
+use List::Util qw(max);
+
+use SL::Common;
+use SL::CT;
+use SL::IC;
+
+require "bin/mozilla/common.pl";
+
 # any custom scripts for this one
-if (-f "$form->{path}/custom_io.pl") {
-  eval { require "$form->{path}/custom_io.pl"; };
+if (-f "bin/mozilla/custom_io.pl") {
+  eval { require "bin/mozilla/custom_io.pl"; };
 }
-if (-f "$form->{path}/$form->{login}_io.pl") {
-  eval { require "$form->{path}/$form->{login}_io.pl"; };
+if (-f "bin/mozilla/$form->{login}_io.pl") {
+  eval { require "bin/mozilla/$form->{login}_io.pl"; };
 }
 
 1;
@@ -74,6 +84,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 #
@@ -82,6 +93,12 @@ use Data::Dumper;
 sub display_row {
   $lxdebug->enter_sub();
   my $numrows = shift;
+
+  my $is_sales =
+    (substr($form->{type}, 0, 6) eq "sales_")
+    || (($form->{type} eq "invoice") && ($form->{script} eq "is.pl"))
+    || ($form->{type} eq 'credit_note');
+
   if ($lizenzen && $form->{vc} eq "customer") {
     if ($form->{type} =~ /sales_order/) {
       @column_index = (runningnumber, partnumber, description, ship, qty);
@@ -100,6 +117,12 @@ 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);
+
+  my %price_factors = map { $_->{id} => $_->{factor} } @{ $form->{ALL_PRICE_FACTORS} };
+
   push @column_index, qw(unit);
 
   #for pricegroups column
@@ -107,7 +130,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);
@@ -121,75 +144,92 @@ sub display_row {
   my $colspan = $#column_index + 1;
 
   $form->{invsubtotal} = 0;
-  map { $form->{"${_}_base"} = 0 } (split / /, $form->{taxaccounts});
+  map { $form->{"${_}_base"} = 0 } (split(/ /, $form->{taxaccounts}));
 
 ########################################
   # Eintrag fuer Version 2.2.0 geaendert #
   # neue Optik im Rechnungsformular      #
 ########################################
   $column_data{runningnumber} =
-      qq|<th align=left nowrap width=5 class=listheading>|
+      qq|<th align="left" nowrap width="5" class="listheading">|
     . $locale->text('No.')
     . qq|</th>|;
   $column_data{partnumber} =
-      qq|<th align=left nowrap width=12 class=listheading>|
+      qq|<th align="left" nowrap width="12" class="listheading">|
     . $locale->text('Number')
     . qq|</th>|;
   $column_data{description} =
-      qq|<th align=left nowrap width=30 class=listheading>|
+      qq|<th align="left" nowrap width="30" class="listheading">|
     . $locale->text('Part Description')
     . qq|</th>|;
-  $column_data{ship} =
-      qq|<th align=left nowrap width=5 class=listheading>|
-    . $locale->text('Ship')
-    . qq|</th>|;
+  if ($form->{"type"} eq "purchase_order") {
+    $column_data{ship} =
+      qq|<th align="left" nowrap width="5" class="listheading">|
+      . $locale->text('Ship rcvd')
+      . qq|</th>|;
+  } else {
+    $column_data{ship} =
+      qq|<th align="left" nowrap width="5" class="listheading">|
+      . $locale->text('Ship')
+      . qq|</th>|;
+  }
   $column_data{qty} =
-      qq|<th align=left nowrap width=5 class=listheading>|
+      qq|<th align="left" nowrap width="5" class="listheading">|
     . $locale->text('Qty')
     . qq|</th>|;
   $column_data{unit} =
-      qq|<th align=left nowrap width=5 class=listheading>|
+      qq|<th align="left" nowrap width="5" class="listheading">|
     . $locale->text('Unit')
     . qq|</th>|;
   $column_data{license} =
-      qq|<th align=left nowrap width=10 class=listheading>|
+      qq|<th align="left" nowrap width="10" class="listheading">|
     . $locale->text('License')
     . qq|</th>|;
   $column_data{serialnr} =
-      qq|<th align=left nowrap width=10 class=listheading>|
+      qq|<th align="left" nowrap width="10" class="listheading">|
     . $locale->text('Serial No.')
     . qq|</th>|;
   $column_data{projectnr} =
-      qq|<th align=left nowrap width=10 class=listheading>|
+      qq|<th align="left" nowrap width="10" class="listheading">|
     . $locale->text('Project')
     . qq|</th>|;
   $column_data{sellprice} =
-      qq|<th align=left nowrap width=15 class=listheading>|
+      qq|<th align="left" nowrap width="15" class="listheading">|
     . $locale->text('Price')
     . qq|</th>|;
-  $column_data{sellprice_drag} =
-      qq|<th align=left nowrap width=15 class=listheading>|
+  $column_data{sellprice_pg} =
+      qq|<th align="left" nowrap width="15" class="listheading">|
     . $locale->text('Pricegroup')
     . qq|</th>|;
   $column_data{discount} =
-      qq|<th align=left class=listheading>|
+      qq|<th align="left" class="listheading">|
     . $locale->text('Discount')
     . qq|</th>|;
   $column_data{linetotal} =
-      qq|<th align=left nowrap width=10 class=listheading>|
+      qq|<th align="left" nowrap width="10" class="listheading">|
     . $locale->text('Extended')
     . qq|</th>|;
   $column_data{bin} =
-      qq|<th align=left nowrap width=10 class=listheading>|
+      qq|<th align="left" nowrap width="10" class="listheading">|
     . $locale->text('Bin')
     . qq|</th>|;
 ############## ENDE Neueintrag ##################
 
+  $myconfig{"show_form_details"} = 1
+    unless (defined($myconfig{"show_form_details"}));
+  $form->{"show_details"} = $myconfig{"show_form_details"}
+    unless (defined($form->{"show_details"}));
+  $form->{"show_details"} = $form->{"show_details"} ? 1 : 0;
+  my $show_details_new = 1 - $form->{"show_details"};
+  my $show_details_checked = $form->{"show_details"} ? "checked" : "";
+
   print qq|
   <tr>
-    <td>
-      <table width=100%>
-	<tr class=listheading>|;
+    <td>| . $cgi->hidden("-name" => "show_details", "-value" => $form->{show_details}) . qq|
+      <input type="checkbox" id="cb_show_details" onclick="show_form_details($show_details_new);" $show_details_checked>
+      <label for="cb_show_details">| . $locale->text("Show details") . qq|</label><br>
+      <table width="100%">
+	<tr class="listheading">|;
 
   map { print "\n$column_data{$_}" } @column_index;
 
@@ -202,6 +242,7 @@ sub display_row {
   $serialnumber  = $locale->text('Serial No.');
   $projectnumber = $locale->text('Project');
   $partsgroup    = $locale->text('Group');
+  $reqdate       = $locale->text('Reqdate');
 
   $delvar = 'deliverydate';
 
@@ -210,37 +251,106 @@ sub display_row {
     $delvar       = 'reqdate';
   }
 
+  $form->{marge_total} = 0;
+  $form->{sellprice_total} = 0;
+  $form->{lastcost_total} = 0;
+  my %projectnumber_labels = ();
+  my @projectnumber_values = ("");
+  foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
+    push(@projectnumber_values, $item->{"id"});
+    $projectnumber_labels{$item->{"id"}} = $item->{"projectnumber"};
+  }
+
   for $i (1 .. $numrows) {
 
     # undo formatting
     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;
+    $decimalplaces = max length($dec), 2;
+
+    $price_factor = $price_factors{$form->{"price_factor_id_$i"}} || 1;
+    $discount     = (100 - $form->{"discount_$i"} * 1) / 100;
+
+    $linetotal    = $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"} * $discount / $price_factor, $decimalplaces);
+
+    my $real_sellprice = $form->{"sellprice_$i"} * $discount / $price_factor;
+
+    # marge calculations
+    my ($marge_font_start, $marge_font_end);
+
+    $form->{"lastcost_$i"} *= 1;
+
+    $marge_price_factor = $form->{"marge_price_factor_$i"} * 1 || 1;
+
+    if ($real_sellprice && ($form->{"qty_$i"} * 1)) {
+      $form->{"marge_percent_$i"}     = ($real_sellprice - $form->{"lastcost_$i"} / $marge_price_factor) * 100 / $real_sellprice;
+      $myconfig{"marge_percent_warn"} = 15 unless (defined($myconfig{"marge_percent_warn"}));
+
+      if ($form->{"id_$i"} &&
+          ($form->{"marge_percent_$i"} < (1 * $myconfig{"marge_percent_warn"}))) {
+        $marge_font_start = "<font color=\"#ff0000\">";
+        $marge_font_end   = "</font>";
+      }
 
-    $discount =
-      $form->round_amount(
-                        $form->{"sellprice_$i"} * $form->{"discount_$i"} / 100,
-                        $decimalplaces);
+    } else {
+      $form->{"marge_percent_$i"} = 0;
+    }
 
-    $linetotal =
-      $form->round_amount($form->{"sellprice_$i"} - $discount, $decimalplaces);
-    $linetotal = $form->round_amount($linetotal * $form->{"qty_$i"}, 2);
+    my $marge_adjust_credit_note = $form->{type} eq 'credit_note' ? -1 : 1;
+    $form->{"marge_total_$i"}  = ($real_sellprice - $form->{"lastcost_$i"} / $marge_price_factor) * $form->{"qty_$i"} * $marge_adjust_credit_note;
+    $form->{"marge_total"}      += $form->{"marge_total_$i"};
+    $form->{"lastcost_total"}   += $form->{"lastcost_$i"} * $form->{"qty_$i"} / $marge_price_factor;
+    $form->{"sellprice_total"}  += $real_sellprice * $form->{"qty_$i"};
+
+    map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}, 2) } qw(marge_total marge_percent);
 
     # 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 #
     # neue Optik im Rechnungsformular      #
 ########################################
     $column_data{runningnumber} =
-      qq|<td><input name="runningnumber_$i" size=5 value=$i></td>|;    # HuT
+      qq|<td><input name="runningnumber_$i" size="5" value="$i"></td>|;    # HuT
 ############## ENDE Neueintrag ##################
 
     $column_data{partnumber} =
@@ -248,70 +358,106 @@ 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">| . H($form->{"description_$i"}) . qq|</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->quote($form->{"description_$i"}) . qq|"><button type="button" onclick="set_longdescription_window('longdescription_$i')">| . $locale->text('L') . qq|</button></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"}, $qty_dec)
-      . qq|></td>|;
+        qq|<td align="right"><input name="qty_$i" size="5" value="|
+      . $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>|
+        . $cgi->hidden("-name" => "formel_$i", "-value" => $form->{"formel_$i"}) . $cgi->hidden("-name" => "alu_$i", "-value" => $form->{"alu_$i"});
+    }
+    $column_data{qty} .= qq|</td>|;
     $column_data{ship} =
-        qq|<td align=right><input name="ship_$i" size=5 value=|
+        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>|;
+      . qq|"></td>|;
+
+    my $is_part     = $form->{"inventory_accno_$i"};
+    my $is_assembly = $form->{"assembly_$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";
+    }
+
+    my $price_factor_select;
+    if (0 < scalar @{ $form->{ALL_PRICE_FACTORS} }) {
+      my @values = ('', map { $_->{id}                      } @{ $form->{ALL_PRICE_FACTORS} });
+      my %labels =      map { $_->{id} => $_->{description} } @{ $form->{ALL_PRICE_FACTORS} };
+
+      $price_factor_select =
+        NTI($cgi->popup_menu('-name'    => "price_factor_id_$i",
+                             '-default' => $form->{"price_factor_id_$i"},
+                             '-values'  => \@values,
+                             '-labels'  => \%labels,
+                             '-style'   => 'width:90px'))
+        . ' ';
+    }
+
+    $column_data{"unit"} = "<td>" .
+      $price_factor_select .
+       AM->unit_select_html($is_part || $is_assembly ? $dimension_units :
+                            $is_assigned ? $service_units : $all_units,
+                            "unit_$i", $this_unit,
+                            $is_assigned ? $form->{"unit_$i"} : undef)
+      . "</td>";
 
-    # build in dragdrop for pricesgroups
+    # 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" onBlur=\"check_right_number_format(this)\"></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" onBlur=\"check_right_number_format(this)\" value="|
         . $form->format_amount(\%myconfig, $form->{"sellprice_$i"},
                                $decimalplaces)
-        . qq|></td>|;
+        . qq|"></td>|;
     }
     $column_data{discount} =
-        qq|<td align=right><input name="discount_$i" size=3 value=|
+        qq|<td align="right"><input name="discount_$i" size=3 value="|
       . $form->format_amount(\%myconfig, $form->{"discount_$i"})
-      . qq|></td>|;
+      . qq|"></td>|;
     $column_data{linetotal} =
-        qq|<td align=right>|
+        qq|<td align="right">|
       . $form->format_amount(\%myconfig, $linetotal, 2)
       . qq|</td>|;
     $column_data{bin} = qq|<td>$form->{"bin_$i"}</td>|;
@@ -330,47 +476,40 @@ 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>|;
-
-    map { print "\n$column_data{$_}" } @column_index;
 
-    print qq|
-        </tr>
+        <tr valign="top" class="listrow$j">|;
 
-<input type=hidden name="orderitems_id_$i" value=$form->{"orderitems_id_$i"}>
-<input type=hidden name="bo_$i" value=$form->{"bo_$i"}>
-
-<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="price_new_$i" value=|
-      . $form->format_amount(\%myconfig, $form->{"price_new_$i"}) . qq|>
-
-<input type=hidden name="id_$i" value=$form->{"id_$i"}>
-<input type=hidden name="inventory_accno_$i" value=$form->{"inventory_accno_$i"}>
-<input type=hidden name="bin_$i" value="$form->{"bin_$i"}">
-<input type=hidden name="partsgroup_$i" value="$form->{"partsgroup_$i"}">
-<input type=hidden name="partnotes_$i" value="$form->{"partnotes_$i"}">
-<input type=hidden name="income_accno_$i" value=$form->{"income_accno_$i"}>
-<input type=hidden name="expense_accno_$i" value=$form->{"expense_accno_$i"}>
-<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"}">
+    map { print "\n$column_data{$_}" } @column_index;
 
-|;
+    print("</tr>\n" .
+          $cgi->hidden("-name" => "unit_old_$i",
+                       "-value" => $form->{"selected_unit_$i"})
+          . "\n" .
+          $cgi->hidden("-name" => "price_new_$i",
+                       "-value" => $form->format_amount(\%myconfig, $form->{"price_new_$i"}))
+          . "\n");
+    map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_}) . "\n"); }
+        ("orderitems_id_$i", "bo_$i", "pricegroup_old_$i", "price_old_$i",
+         "id_$i", "inventory_accno_$i", "bin_$i", "partsgroup_$i", "partnotes_$i",
+         "income_accno_$i", "expense_accno_$i", "listprice_$i", "assembly_$i",
+         "taxaccounts_$i", "ordnumber_$i", "transdate_$i", "cusordnumber_$i",
+         "longdescription_$i", "basefactor_$i", "marge_total_$i", "marge_percent_$i", "lastcost_$i",
+         "marge_price_factor_$i"));
 
 ########################################
     # Eintrag fuer Version 2.2.0 geaendert #
     # neue Optik im Rechnungsformular      #
 ########################################
+
+    my $row_style_attr =
+      'style="display:none;"' if (!$form->{"show_details"});
+
     # print second row
     print qq|
-        <tr>
-	  <td colspan=$colspan>
+        <tr  class="listrow$j" $row_style_attr>
+	  <td colspan="$colspan">
 |;
     if ($lizenzen && $form->{type} eq "invoice" && $form->{vc} eq "customer") {
       my $selected = $form->{"licensenumber_$i"};
@@ -381,30 +520,61 @@ sub display_row {
       $lizenzen_quoted = $form->{"lizenzen_$i"};
       $lizenzen_quoted =~ s/\"/&quot;/g;
       print qq|
-	<b>Lizenz\#</b>&nbsp;<select name="licensenumber_$i" size=1>
+	<b>Lizenz\#</b>&nbsp;<select name="licensenumber_$i" size="1">
 	$form->{"lizenzen_$i"}
         </select>
-	<input type=hidden name="lizenzen_$i" value="${lizenzen_quoted}">
+	<input type="hidden" name="lizenzen_$i" value="${lizenzen_quoted}">
 |;
     }
     if ($form->{type} !~ /_quotation/) {
       print qq|
-          <b>$serialnumber</b>&nbsp;<input name="serialnumber_$i" size=15 value="$form->{"serialnumber_$i"}">|;
+          <b>$serialnumber</b>&nbsp;<input name="serialnumber_$i" size="15" value="$form->{"serialnumber_$i"}">|;
+    }
+
+    print qq|<b>$projectnumber</b>&nbsp;| .
+      NTI($cgi->popup_menu('-name' => "project_id_$i",
+                           '-values' => \@projectnumber_values,
+                           '-labels' => \%projectnumber_labels,
+                           '-default' => $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" onBlur="check_right_date_format(this)" 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>
+|;
+
+    if ($form->{"id_$i"} && $is_sales) {
+      my $marge_price_factor;
+
+      $form->{"marge_price_factor_$i"} *= 1;
+
+      if ($form->{"marge_price_factor_$i"} && (1 != $form->{"marge_price_factor_$i"})) {
+        $marge_price_factor = '/' . $form->format_amount(\%myconfig, $form->{"marge_price_factor_$i"});
+      }
+
+      print qq|
+          ${marge_font_start}<b>| . $locale->text('Ertrag') . qq|</b>&nbsp;$form->{"marge_total_$i"}&nbsp;$form->{"marge_percent_$i"} % ${marge_font_end}
+          &nbsp;<b>| . $locale->text('LP') . qq|</b>&nbsp;| . $form->format_amount(\%myconfig, $form->{"listprice_$i"}, 2) . qq|
+          &nbsp;<b>| . $locale->text('EK') . qq|</b>&nbsp;| . $form->format_amount(\%myconfig, $form->{"lastcost_$i"}, 2) . $marge_price_factor;
     }
 
     print qq|
-          <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"}">
 	  </td>
 	</tr>
-
 |;
 
 ############## ENDE Neueintrag ##################
 
     map { $form->{"${_}_base"} += $linetotal }
-      (split / /, $form->{"taxaccounts_$i"});
+      (split(/ /, $form->{"taxaccounts_$i"}));
 
     $form->{invsubtotal} += $linetotal;
   }
@@ -415,6 +585,10 @@ sub display_row {
   </tr>
 |;
 
+  if (0 != ($form->{sellprice_total} * 1)) {
+    $form->{marge_percent} = ($form->{sellprice_total} - $form->{lastcost_total}) / $form->{sellprice_total} * 100;
+  }
+
   $lxdebug->leave_sub();
 }
 
@@ -422,30 +596,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)) {
@@ -456,10 +632,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();
@@ -467,18 +641,19 @@ sub set_pricegroup {
 
 sub select_item {
   $lxdebug->enter_sub();
-  @column_index = qw(ndx partnumber description onhand sellprice);
+  @column_index = qw(ndx partnumber description onhand unit sellprice);
 
   $column_data{ndx}        = qq|<th>&nbsp;</th>|;
   $column_data{partnumber} =
-    qq|<th class=listheading>| . $locale->text('Number') . qq|</th>|;
+    qq|<th class="listheading">| . $locale->text('Number') . qq|</th>|;
   $column_data{description} =
-    qq|<th class=listheading>| . $locale->text('Part Description') . qq|</th>|;
+    qq|<th class="listheading">| . $locale->text('Part Description') . qq|</th>|;
   $column_data{sellprice} =
-    qq|<th class=listheading>| . $locale->text('Price') . qq|</th>|;
+    qq|<th class="listheading">| . $locale->text('Price') . qq|</th>|;
   $column_data{onhand} =
-    qq|<th class=listheading>| . $locale->text('Qty') . qq|</th>|;
-
+    qq|<th class="listheading">| . $locale->text('Qty') . qq|</th>|;
+  $column_data{unit} =
+    qq|<th class="listheading">| . $locale->text('Unit') . qq|</th>|;
   # list items with radio button on a form
   $form->header;
 
@@ -486,16 +661,16 @@ sub select_item {
   $colspan = $#column_index + 1;
 
   print qq|
-<body>
+  <body>
 
-<form method=post action=$form->{script}>
+<form method="post" action="$form->{script}">
 
-<table width=100%>
+<table width="100%">
   <tr>
-    <th class=listtop colspan=$colspan>$title</th>
+    <th class="listtop" colspan="$colspan">$title</th>
   </tr>
   <tr height="5"></tr>
-  <tr class=listheading>|;
+  <tr class="listheading">|;
 
   map { print "\n$column_data{$_}" } @column_index;
 
@@ -512,31 +687,33 @@ sub select_item {
           $ref->{"lizenzen"} .=
             qq|<option value=\"$item->{"id"}\">$item->{"licensenumber"}</option>|;
         }
-        $ref->{"lizenzen"} .= qq|<option value=-1>Neue Lizenz</option>|;
+        $ref->{"lizenzen"} .= qq|<option value="-1">Neue Lizenz</option>|;
         $ref->{"lizenzen"} =~ s/\"/&quot;/g;
       }
     }
 
     map { $ref->{$_} =~ s/\"/&quot;/g } qw(partnumber description unit);
 
-    #sk tradediscount
-    $ref->{sellprice} =
-      $form->round_amount($ref->{sellprice} * (1 - $form->{tradediscount}), 2);
+    my $display_sellprice  = $ref->{sellprice} * (1 - $form->{tradediscount});
+    $display_sellprice    /= $ref->{price_factor} if ($ref->{price_factor});
+    $display_sellprice     = $form->format_amount(\%myconfig, $display_sellprice, 2);
+
     $column_data{ndx} =
-      qq|<td><input name=ndx class=radio type=radio value=$i $checked></td>|;
+      qq|<td><input name="ndx" class="radio" type="radio" value="$i" $checked></td>|;
     $column_data{partnumber} =
-      qq|<td><input name="new_partnumber_$i" type=hidden value="$ref->{partnumber}">$ref->{partnumber}</td>|;
+      qq|<td><input name="new_partnumber_$i" type="hidden" value="$ref->{partnumber}">$ref->{partnumber}</td>|;
     $column_data{description} =
-      qq|<td><input name="new_description_$i" type=hidden value="$ref->{description}">$ref->{description}</td>|;
+      qq|<td><input name="new_description_$i" type="hidden" value="$ref->{description}">$ref->{description}</td>|;
     $column_data{sellprice} =
-      qq|<td align=right><input name="new_sellprice_$i" type=hidden value=$ref->{sellprice}>|
-      . $form->format_amount(\%myconfig, $ref->{sellprice}, 2, "&nbsp;")
+      qq|<td align="right"><input name="new_sellprice_$i" type="hidden" value="$ref->{sellprice}">|
+      . $display_sellprice
       . qq|</td>|;
     $column_data{onhand} =
-      qq|<td align=right><input name="new_onhand_$i" type=hidden value=$ref->{onhand}>|
+      qq|<td align="right"><input name="new_onhand_$i" type="hidden" value="$ref->{onhand}">|
       . $form->format_amount(\%myconfig, $ref->{onhand}, '', "&nbsp;")
       . qq|</td>|;
-
+    $column_data{unit} =
+      qq|<td>$ref->{unit}</td>|;
     $j++;
     $j %= 2;
     print qq|
@@ -544,36 +721,23 @@ sub select_item {
 
     map { print "\n$column_data{$_}" } @column_index;
 
-    print qq|
-</tr>
-
-<input name="new_bin_$i" type=hidden value="$ref->{bin}">
-<input name="new_listprice_$i" type=hidden value=$ref->{listprice}>
-<input name="new_inventory_accno_$i" type=hidden value=$ref->{inventory_accno}>
-<input name="new_income_accno_$i" type=hidden value=$ref->{income_accno}>
-<input name="new_expense_accno_$i" type=hidden value=$ref->{expense_accno}>
-<input name="new_unit_$i" type=hidden value="$ref->{unit}">
-<input name="new_weight_$i" type=hidden value="$ref->{weight}">
-<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}">
+    print("</tr>\n");
 
-<input name="new_id_$i" type=hidden value=$ref->{id}>
-
-|;
-    if ($lizenzen) {
-      print qq|
-<input name="new_lizenzen_$i" type=hidden value="$ref->{lizenzen}">
-|;
-    }
+    my @new_fields =
+      qw(bin listprice inventory_accno income_accno expense_accno unit weight
+         assembly taxaccounts partsgroup formel longdescription not_discountable
+         part_payment_id partnotes id lastcost price_factor_id price_factor);
+    push(@new_fields, "lizenzen") if ($lizenzen);
 
+    print join "\n", map { $cgi->hidden("-name" => "new_${_}_$i", "-value" => $ref->{$_}) } @new_fields;
+    print "\n";
   }
 
   print qq|
-<tr><td colspan=8><hr size=3 noshade></td></tr>
+<tr><td colspan="8"><hr size="3" noshade></td></tr>
 </table>
 
-<input name=lastndx type=hidden value=$i>
+<input name="lastndx" type="hidden" value="$i">
 
 |;
 
@@ -583,14 +747,14 @@ sub select_item {
   # save all other form variables
   foreach $key (keys %${form}) {
     $form->{$key} =~ s/\"/&quot;/g;
-    print qq|<input name=$key type=hidden value="$form->{$key}">\n|;
+    print qq|<input name="$key" type="hidden" value="$form->{$key}">\n|;
   }
 
   print qq|
-<input type=hidden name=nextsub value=item_selected>
+<input type="hidden" name="nextsub" value="item_selected">
 
 <br>
-<input class=submit type=submit name=action value="|
+<input class="submit" type="submit" name="action" value="|
     . $locale->text('Continue') . qq|">
 </form>
 
@@ -618,8 +782,19 @@ sub item_selected {
   # if there was a price entered, override it
   $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);
+  my @new_fields =
+    qw(id partnumber description sellprice listprice inventory_accno
+       income_accno expense_accno bin unit weight assembly taxaccounts
+       partsgroup formel longdescription not_discountable partnotes lastcost
+       price_factor_id price_factor);
+
+  map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} } @new_fields;
+
+  $form->{"marge_price_factor_$i"} = $form->{"new_price_factor_$j"};
+
+  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);
@@ -646,6 +821,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) *
@@ -662,8 +841,7 @@ sub item_selected {
 
   # delete all the new_ variables
   for $i (1 .. $form->{lastndx}) {
-    map { delete $form->{"new_${_}_$i"} }
-      qw(partnumber description sellprice bin listprice inventory_accno income_accno expense_accno unit assembly taxaccounts id);
+    map { delete $form->{"new_${_}_$i"} } @new_fields;
   }
 
   map { delete $form->{$_} } qw(ndx lastndx nextsub);
@@ -713,36 +891,30 @@ sub new_item {
   print qq|
 <body>
 
-<h4 class=error>| . $locale->text('Item not on file!') . qq|
+<h4 class="error">| . $locale->text('Item not on file!') . qq|
 
 <p>
 | . $locale->text('What type of item is this?') . qq|</h4>
 
-<form method=post action=ic.pl>
+<form method="post" action="ic.pl">
 
 <p>
 
-  <input class=radio type=radio name=item value=part checked>&nbsp;|
+  <input class="radio" type="radio" name="item" value="part" checked>&nbsp;|
     . $locale->text('Part') . qq|<br>
-  <input class=radio type=radio name=item value=service>&nbsp;|
-    . $locale->text('Service')
-
-    . qq|
-<input type=hidden name=previousform value="$previousform">
-<input type=hidden name=partnumber value="$form->{"partnumber_$i"}">
-<input type=hidden name=description value="$form->{"description_$i"}">
-<input type=hidden name=rowcount value=$form->{rowcount}>
-<input type=hidden name=taxaccount2 value=$form->{taxaccounts}>
-<input type=hidden name=vc value=$form->{vc}>
+  <input class="radio" type="radio" name="item" value="service">&nbsp;|
+    . $locale->text('Service');
 
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
+  print $cgi->hidden("-name" => "previousform", "-value" => $previousform);
+  map { print $cgi->hidden("-name" => $_, "-value" => $form->{$_}); }        qw(rowcount vc login password);
+  map { print $cgi->hidden("-name" => $_, "-value" => $form->{"${_}_$i"}); } qw(partnumber description unit sellprice price_factor_id);
+  print $cgi->hidden("-name" => "taxaccount2", "-value" => $form->{taxaccounts});
 
-<input type=hidden name=nextsub value=add>
+print qq|
+<input type="hidden" name="nextsub" value="add">
 
 <p>
-<input class=submit type=submit name=action value="|
+<input class="submit" type="submit" name="action" value="|
     . $locale->text('Continue') . qq|">
 </form>
 
@@ -756,44 +928,54 @@ sub new_item {
 sub display_form {
   $lxdebug->enter_sub();
 
-  # 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}++;
+  relink_accounts();
 
-    #$form->{rowcount}--;
-    #$form->{rowcount}--;
+  my $new_rowcount = $form->{"rowcount"} * 1 + 1;
+  $form->{"project_id_${new_rowcount}"} = $form->{"globalproject_id"};
 
-    $form->{print_and_post} = 0;
+  $form->language_payment(\%myconfig);
 
-    &print_form($old_form);
+  # if we have a display_form
+  if ($form->{display_form}) {
+    call_sub($form->{"display_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;
-
-  }
+  Common::webdav_folder($form) if ($webdav);
+
+  #   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};
@@ -811,7 +993,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);
@@ -826,7 +1008,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);
@@ -846,9 +1028,7 @@ sub check_form {
   $lxdebug->enter_sub();
   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)
-  );
+  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 payment_id not_discountable shop ve gv buchungsgruppen_id language_values sellprice_pg pricegroup_old price_old price_new unit_old ordnumber transdate longdescription basefactor marge_total marge_percent marge_price_factor lastcost price_factor_id));
 
   # remove any makes or model rows
   if ($form->{item} eq 'part') {
@@ -918,6 +1098,9 @@ sub check_form {
     $form->redo_rows(\@flds, \@a, $count, $form->{makemodel_rows});
     $form->{makemodel_rows} = $count;
 
+  } elsif ($form->{item} eq 'service') {
+    map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(listprice sellprice lastcost);
+
   } else {
 
     # this section applies to invoices and orders
@@ -986,12 +1169,12 @@ sub invoicetotal {
 
     $amount = $sellprice * (1 - $discount / 100) * $qty;
     map { $form->{"${_}_base"} += $amount }
-      (split / /, $form->{"taxaccounts_$i"});
+      (split (/ /, $form->{"taxaccounts_$i"}));
     $form->{oldinvtotal} += $amount;
   }
 
   map { $form->{oldinvtotal} += ($form->{"${_}_base"} * $form->{"${_}_rate"}) }
-    split / /, $form->{taxaccounts}
+    split(/ /, $form->{taxaccounts})
     if !$form->{taxincluded};
 
   $form->{oldtotalpaid} = 0;
@@ -1029,6 +1212,9 @@ sub order {
   }
   $form->{ordnumber} = $form->{invnumber};
 
+  $form->{old_employee_id} = $form->{employee_id};
+  $form->{old_salesman_id} = $form->{salesman_id};
+
   map { delete $form->{$_} } qw(id printed emailed queued);
   if ($form->{script} eq 'ir.pl' || $form->{type} eq 'request_quotation') {
     $form->{title} = $locale->text('Add Purchase Order');
@@ -1048,10 +1234,13 @@ sub order {
 
   $form->{rowcount}--;
 
-  ($null, $form->{cp_id}) = split /--/, $form->{contact};
   $form->{cp_id} *= 1;
 
-  require "$form->{path}/$form->{script}";
+  require "bin/mozilla/$form->{script}";
+  my $script = $form->{"script"};
+  $script =~ s|.*/||;
+  $script =~ s|.pl$||;
+  $locale = new Locale($language, $script);
 
   map { $form->{"select$_"} = "" } ($form->{vc}, currency);
 
@@ -1070,6 +1259,13 @@ sub order {
                     \%myconfig, $form->{currency}, $form->{transdate}, $buysell
                     )));
 
+  for $i (1 .. $form->{rowcount}) {
+    map({ $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig,
+                                                     $form->{"${_}_${i}"})
+            if ($form->{"${_}_${i}"}) }
+        qw(ship qty sellprice listprice basefactor));
+  }
+
   &prepare_order;
   &display_form;
 
@@ -1096,7 +1292,6 @@ sub quotation {
     $buysell       = 'buy';
   }
 
-  ($null, $form->{cp_id}) = split /--/, $form->{contact};
   $form->{cp_id} *= 1;
 
   $form->{script} = 'oe.pl';
@@ -1105,7 +1300,7 @@ sub quotation {
 
   $form->{rowcount}--;
 
-  require "$form->{path}/$form->{script}";
+  require "bin/mozilla/$form->{script}";
 
   map { $form->{"select$_"} = "" } ($form->{vc}, currency);
 
@@ -1124,110 +1319,58 @@ sub quotation {
                     \%myconfig, $form->{currency}, $form->{transdate}, $buysell
                     )));
 
+  for $i (1 .. $form->{rowcount}) {
+    map({ $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig,
+                                                     $form->{"${_}_${i}"})
+            if ($form->{"${_}_${i}"}) }
+        qw(ship qty sellprice listprice basefactor));
+  }
+
   &prepare_order;
   &display_form;
 
   $lxdebug->leave_sub();
 }
 
-sub e_mail {
+sub request_for_quotation {
+  quotation();
+}
+
+sub edit_e_mail {
   $lxdebug->enter_sub();
   if ($form->{second_run}) {
     $form->{print_and_post} = 0;
     $form->{resubmit}       = 0;
   }
-  if ($myconfig{role} eq 'admin') {
-    $bcc = qq|
- 	  <th align=right nowrap=true>| . $locale->text('Bcc') . qq|</th>
-	  <td><input name=bcc size=30 value="$form->{bcc}"></td>
-|;
-  }
 
-  if ($form->{formname} =~ /(pick|packing|bin)_list/) {
-    $form->{email} = $form->{shiptoemail} if $form->{shiptoemail};
+  $form->{email} = $form->{shiptoemail} if $form->{shiptoemail} && $form->{formname} =~ /(pick|packing|bin)_list/;
+
+  if ($form->{"cp_id"} && !$form->{"email"}) {
+    CT->get_contact(\%myconfig, $form);
+    $form->{"email"} = $form->{"cp_email"};
   }
 
-  $name = $form->{ $form->{vc} };
-  $name =~ s/--.*//g;
-  $title = $locale->text('E-mail') . " $name";
+  $title = $locale->text('E-mail') . " " . $form->get_formname_translation();
 
   $form->{oldmedia} = $form->{media};
   $form->{media}    = "email";
 
-  $form->header;
-
-  print qq|
-<body>
-
-<form method=post action=$form->{script}>
-
-<table width=100%>
-  <tr class=listtop>
-    <th class=listtop>$title</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>
-      <table width=100%>
-	<tr>
-	  <th align=right nowrap>| . $locale->text('To') . qq|</th>
-	  <td><input name=email size=30 value="$form->{email}"></td>
-	  <th align=right nowrap>| . $locale->text('Cc') . qq|</th>
-	  <td><input name=cc size=30 value="$form->{cc}"></td>
-	</tr>
-	<tr>
-	  <th align=right nowrap>| . $locale->text('Subject') . qq|</th>
-	  <td><input name=subject size=30 value="$form->{subject}"></td>
-	  $bcc
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <table width=100%>
-	<tr>
-	  <th align=left nowrap>| . $locale->text('Message') . qq|</th>
-	</tr>
-	<tr>
-	  <td><textarea name=message rows=15 cols=60 wrap=soft>$form->{message}</textarea></td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td>
-|;
-
-  &print_options;
-
-  map { delete $form->{$_} }
-    qw(action email cc bcc subject message formname sendmode format header override);
-
-  # save all other variables
-  foreach $key (keys %$form) {
-    $form->{$key} =~ s/\"/&quot;/g;
-    print qq|<input type=hidden name=$key value="$form->{$key}">\n|;
-  }
+  my $attachment_filename = $form->generate_attachment_filename();
 
-  print qq|
-    </td>
-  </tr>
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-</table>
-
-<input type=hidden name=nextsub value=send_email>
+  $form->{"fokus"} = $form->{"email"} ? "Form.subject" : "Form.email";
+  $form->header;
 
-<br>
-<input name=action class=submit type=submit value="|
-    . $locale->text('Continue') . qq|">
-</form>
+  my (@dont_hide_key_list, %dont_hide_key, @hidden_keys);
+  @dont_hide_key_list = qw(action email cc bcc subject message formname sendmode format header override);
+  @dont_hide_key{@dont_hide_key_list} = (1) x @dont_hide_key_list;
+  @hidden_keys = grep { !$dont_hide_key{$_} } grep { !ref $form->{$_} } keys %$form;
 
-</body>
-</html>
-|;
+  print $form->parse_html_template('generic/edit_email', 
+                                  { title           => $title,
+                                    a_filename      => $attachment_filename,
+                                    _print_options_ => print_options({ 'inline' => 1 }),
+                                    HIDDEN          => [ map +{ name => $_, value => $form->{$_} }, @hidden_keys ],
+                                    SHOW_BCC        => $myconfig{role} eq 'admin' });
 
   $lxdebug->leave_sub();
 }
@@ -1235,176 +1378,142 @@ sub e_mail {
 sub send_email {
   $lxdebug->enter_sub();
 
-  $old_form = new Form;
+  my $callback = $form->{script} . "?action=edit";
+  map({ $callback .= "\&${_}=" . E($form->{$_}); }
+      qw(login password type id));
 
-  map { $old_form->{$_} = $form->{$_} } keys %$form;
-  $old_form->{media} = $form->{oldmedia};
+  print_form("return");
 
-  &print_form($old_form);
+  Common->save_email_status(\%myconfig, $form);
+
+  $form->{callback} = $callback;
+  $form->redirect();
 
   $lxdebug->leave_sub();
 }
 
+# generate the printing options displayed at the bottom of oe and is forms.
+# this function will attempt to guess what type of form is displayed, and will generate according options
+#
+# about the coding: 
+# this version builds the arrays of options pretty directly. if you have trouble understanding how,
+# the opthash function builds hashrefs which are then pieced together for the template arrays.
+# unneeded options are "undef"ed out, and then grepped out. 
+#
+# the inline options is untested, but intended to be used later in metatemplating
 sub print_options {
   $lxdebug->enter_sub();
-  $form->{sendmode} = "attachment";
-  $form->{copies}   = 3 unless $form->{copies};
-
-  $form->{PD}{ $form->{formname} } = "selected";
-  $form->{DF}{ $form->{format} }   = "";
-  $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}>|
-      . $locale->text('Purchase Order') . qq|
-	    <option value=bin_list $form->{PD}{bin_list}>|
-      . $locale->text('Bin List');
-  }
-
-  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=pick_list $form->{PD}{pick_list}>|
-      . $locale->text('Pick List') . qq|
-	    <option value=packing_list $form->{PD}{packing_list}>|
-      . $locale->text('Packing List');
-  }
-
-  if ($form->{type} =~ /_quotation$/) {
-    $type = qq|<select name=formname>
-	    <option value="$`_quotation" $form->{PD}{"$`_quotation"}>|
-      . $locale->text('Quotation') . qq|
-|;
-  }
-
-  if ($form->{type} eq 'invoice') {
-    $type = qq|<select name=formname>
-	    <option value=invoice $form->{PD}{invoice}>| . $locale->text('Invoice');
-  }
-
-  if ($form->{type} eq 'ship_order') {
-    $type = qq|<select name=formname>
-	    <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');
-  }
-
-  if ($form->{type} eq 'receive_order') {
-    $type = qq|<select name=formname>
-	    <option value=bin_list $form->{PD}{bin_list}>|
-      . $locale->text('Bin List');
-  }
-
-  if ($form->{media} eq 'email') {
-    $media = qq|<select name=sendmode>
-	    <option value=attachment $form->{SM}{attachment}>|
-      . $locale->text('Attachment') . qq|
-	    <option value=inline $form->{SM}{inline}>| . $locale->text('In-line');
-  } else {
-    $media = qq|<select name=media>
-	    <option value=screen $form->{OP}{screen}>| . $locale->text('Screen');
-    if ($myconfig{printer} && $latex) {
-      $media .= qq|
-            <option value=printer $form->{OP}{printer}>|
-        . $locale->text('Printer');
-    }
-    if ($latex) {
-      $media .= qq|
-            <option value=queue $form->{OP}{queue}>| . $locale->text('Queue');
-    }
-  }
-
-  $format = qq|<select name=format>
-            <option value=html $form->{DF}{html}>html|;
-
-  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>|;
-    }
-  }
-
-  print qq|
-<table width=100% cellspacing=0 cellpadding=0>
-  <tr>
-    <td>
-      <table>
-	<tr>
-	  <td>$type</select></td>
-          <td>$language</select</td>
-	  <td>$format</select></td>
-	  <td>$media</select></td>
-|;
 
-  if ($myconfig{printer} && $latex && $form->{media} ne 'email') {
-    print qq|
-	  <td>| . $locale->text('Copies') . qq|
-	  <input name=copies size=2 value=$form->{copies}></td>
-|;
-  }
+  my %options = @_;
 
-  $form->{groupitems} = "checked" if $form->{groupitems};
+  # names 3 parameters and returns a hashref, for use in templates
+  sub opthash { +{ value => shift, selected => shift, oname => shift } }
+  (@FORMNAME, @FORMNAME, @LANGUAGE_ID, @FORMAT, @SENDMODE, @MEDIA, @PRINTER_ID, @SELECTS) = ();
 
-  print qq|
-          <td>| . $locale->text('Group Items') . qq|</td>
-          <td><input name=groupitems type=checkbox class=checkbox $form->{groupitems}></td>
-        </tr>
-      </table>
-    </td>
-    <td align=right>
-      <table>
-        <tr>
-|;
+  # note: "||"-selection is only correct for values where "0" is _not_ a correct entry
+  $form->{sendmode}   = "attachment";
+  $form->{format}     = $form->{format} || $myconfig{template_format} || "pdf";
+  $form->{copies}     = $form->{copies} || $myconfig{copies} || 3;
+  $form->{media}      = $form->{media} || $myconfig{default_media} || "screen";
+  $form->{printer_id} = defined $form->{printer_id}           ? $form->{printer_id} :
+                        defined $myconfig{default_printer_id} ? $myconfig{default_printer_id} : "";
 
-  if ($form->{printed} =~ /$form->{formname}/) {
-    print qq|
-	  <th>\|| . $locale->text('Printed') . qq|\|</th>
-|;
-  }
+  $form->{PD}{ $form->{formname} } = "selected";
+  $form->{DF}{ $form->{format} }   = "selected";
+  $form->{OP}{ $form->{media} }    = "selected";
+  $form->{SM}{ $form->{formname} } = "selected";
+
+  push @FORMNAME, grep $_,
+    ($form->{type} eq 'purchase_order') ? (
+      opthash("purchase_order", $form->{PD}{purchase_order}, $locale->text('Purchase Order')),
+      opthash("bin_list", $form->{PD}{bin_list}, $locale->text('Bin List')) 
+    ) : undef,
+    ($form->{type} eq 'credit_note') ?
+      opthash("credit_note", $form->{PD}{credit_note}, $locale->text('Credit Note')) : undef,
+    ($form->{type} eq 'sales_order') ? (
+      opthash("sales_order", $form->{PD}{sales_order}, $locale->text('Confirmation')),
+      opthash("proforma", $form->{PD}{proforma}, $locale->text('Proforma Invoice')),
+      opthash("pick_list", $form->{PD}{pick_list}, $locale->text('Pick List')),
+      opthash("packing_list", $form->{PD}{packing_list}, $locale->text('Packing List')) 
+    ) : undef,
+    ($form->{type} =~ /_quotation$/) ?
+      opthash("$`_quotation", $form->{PD}{"$`_quotation"}, $locale->text('Quotation')) : undef,
+    ($form->{type} eq 'invoice') ? (
+      opthash("invoice", $form->{PD}{invoice}, $locale->text('Invoice')),
+      opthash("proforma", $form->{PD}{proforma}, $locale->text('Proforma Invoice')),
+      opthash("packing_list", $form->{PD}{packing_list}, $locale->text('Packing List'))
+    ) : undef,
+    ($form->{type} eq 'invoice' && $form->{storno}) ? (
+      opthash("storno_invoice", $form->{PD}{storno_invoice}, $locale->text('Storno Invoice')),
+      opthash("storno_packing_list", $form->{PD}{storno_packing_list}, $locale->text('Storno Packing List')) 
+    ) : undef,
+    ($form->{type} eq 'credit_note') ?
+      opthash("credit_note", $form->{PD}{credit_note}, $locale->text('Credit Note')) : undef;
+
+  push @SENDMODE, 
+    opthash("attachment", $form->{SM}{attachment}, $locale->text('Attachment')),
+    opthash("inline", $form->{SM}{inline}, $locale->text('In-line'))
+      if ($form->{media} eq 'email');
+
+  push @MEDIA, grep $_,
+      opthash("screen", $form->{OP}{screen}, $locale->text('Screen')),
+    (scalar @{ $form->{printers} } && $latex_templates) ?
+      opthash("printer", $form->{OP}{printer}, $locale->text('Printer')) : undef,
+    ($latex_templates && !$options{no_queue}) ?
+      opthash("queue", $form->{OP}{queue}, $locale->text('Queue')) : undef
+        if ($form->{media} ne 'email');
+
+  push @FORMAT, grep $_,
+    ($opendocument_templates && $openofficeorg_writer_bin && $xvfb_bin && (-x $openofficeorg_writer_bin) && (-x $xvfb_bin)
+     && !$options{no_opendocument_pdf}) ?
+      opthash("opendocument_pdf", $form->{DF}{"opendocument_pdf"}, $locale->text("PDF (OpenDocument/OASIS)")) : undef,
+    ($latex_templates) ?
+      opthash("pdf", $form->{DF}{pdf}, $locale->text('PDF')) : undef,
+    ($latex_templates && !$options{no_postscript}) ?
+      opthash("postscript", $form->{DF}{postscript}, $locale->text('Postscript')) : undef,
+    (!$options{no_html}) ?
+      opthash("html", $form->{DF}{html}, "HTML") : undef,
+    ($opendocument_templates && !$options{no_opendocument}) ?
+      opthash("opendocument", $form->{DF}{opendocument}, $locale->text("OpenDocument/OASIS")) : undef;
+
+  push @LANGUAGE_ID, 
+    map { opthash($_->{id}, ($_->{id} eq $form->{language_id} ? 'selected' : ''), $_->{description}) } +{}, @{ $form->{languages} }
+      if (ref $form->{languages} eq 'ARRAY');
+
+  push @PRINTER_ID, 
+    map { opthash($_->{id}, ($_->{id} eq $form->{printer_id} ? 'selected' : ''), $_->{printer_description}) } +{}, @{ $form->{printers} }
+      if ((ref $form->{printers} eq 'ARRAY') && scalar @{ $form->{printers } });
+
+  @SELECTS = map { sname => lc $_, DATA => \@$_, show => !$options{"hide_" . lc($_)} && scalar @$_ }, qw(FORMNAME LANGUAGE_ID FORMAT SENDMODE MEDIA PRINTER_ID);
+
+  my %dont_display_groupitems = (
+    'dunning' => 1,
+    );
+
+  %template_vars = (
+    display_copies       => scalar @{ $form->{printers} } && $latex_templates && $form->{media} ne 'email',
+    display_remove_draft => (!$form->{id} && $form->{draft_id}),
+    display_groupitems   => !$dont_display_groupitems{$form->{type}},
+    groupitems_checked   => $form->{groupitems} ? "checked" : '',
+    remove_draft_checked => $form->{remove_draft} ? "checked" : ''
+  );
 
-  if ($form->{emailed} =~ /$form->{formname}/) {
-    print qq|
-	  <th>\|| . $locale->text('E-mailed') . qq|\|</th>
-|;
-  }
+  my $print_options = $form->parse_html_template("generic/print_options", { SELECTS  => \@SELECTS, %template_vars } );
 
-  if ($form->{queued} =~ /$form->{formname}/) {
-    print qq|
-	  <th>\|| . $locale->text('Queued') . qq|\|</th>
-|;
+  if ($options{inline}) {
+    $lxdebug->leave_sub() and return $print_options;
+  } else {
+    print $print_options; $lxdebug->leave_sub();
   }
-
-  print qq|
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-|;
-
-  $lxdebug->leave_sub();
 }
 
 sub print {
   $lxdebug->enter_sub();
-  if ($form->{second_run}) {
-    $form->{print_and_post} = 0;
+
+  if ($form->{print_nextsub}) {
+    call_sub($form->{print_nextsub});
+    $lxdebug->leave_sub();
+    return;
   }
 
   # if this goes to the printer pass through
@@ -1416,6 +1525,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();
@@ -1447,10 +1568,31 @@ sub print_form {
     $inv                  = "ord";
     $due                  = "req";
     $form->{"${inv}date"} = $form->{transdate};
-    $form->{label}        = $locale->text('Sales Order');
+    $form->{label}        = $locale->text('Confirmation');
+    $numberfld            = "sonumber";
+    $order                = 1;
+  }
+
+  if (($form->{type} eq 'invoice') && ($form->{formname} eq 'proforma') ) {
+    $inv                  = "inv";
+    $due                  = "due";
+    $form->{"${inv}date"} = $form->{invdate};
+    $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
@@ -1459,6 +1601,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";
@@ -1491,11 +1635,22 @@ 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";
     $form->{"${inv}date"} = $form->{transdate};
-    $form->{label}        = $locale->text('Quotation');
+    $form->{label}        = $locale->text('RFQ');
     $numberfld            = "rfqnumber";
     $order                = 1;
   }
@@ -1503,7 +1658,9 @@ sub print_form {
   $form->isblank("email", $locale->text('E-mail address missing!'))
     if ($form->{media} eq 'email');
   $form->isblank("${inv}date",
-                 $locale->text($form->{label} . ' Date missing!'));
+           $locale->text($form->{label}) 
+           . ": "
+           . $locale->text(' Date missing!'));
 
   # $locale->text('Invoice Number missing!')
   # $locale->text('Invoice Date missing!')
@@ -1515,7 +1672,8 @@ sub print_form {
   # $locale->text('Quotation Date missing!')
 
   # assign number
-  if (!$form->{"${inv}number"} && !$form->{preview}) {
+  $form->{what_done} = $form->{formname};
+  if (!$form->{"${inv}number"} && !$form->{preview} && !$form->{id}) {
     $form->{"${inv}number"} = $form->update_defaults(\%myconfig, $numberfld);
     if ($form->{media} ne 'email') {
 
@@ -1527,7 +1685,14 @@ sub print_form {
 
       $form->{rowcount}--;
 
-      &{"$display_form"};
+      call_sub($display_form);
+      # saving the history
+  	  if(!exists $form->{addition}) {
+        $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; 
+  	    $form->{addition} = "PRINTED";
+  	    $form->save_history($form->dbconnect(\%myconfig));
+      }
+      # /saving the history
       exit;
     }
   }
@@ -1538,37 +1703,38 @@ sub print_form {
   my ($saved_email, $saved_cc, $saved_bcc) =
     ($form->{"email"}, $form->{"cc"}, $form->{"bcc"});
 
-  $language = $form->{language};
-  &{"$form->{vc}_details"};
-  $form->{language} = $language;
+  $language_saved = $form->{language_id};
+  $payment_id_saved = $form->{payment_id};
+  $salesman_id_saved = $form->{salesman_id};
+  $cp_id_saved = $form->{cp_id};
+
+  call_sub("$form->{vc}_details");
+
+  $form->{language_id} = $language_saved;
+  $form->{payment_id} = $payment_id_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");
+  if (!$cp_id_saved) {
+    # No contact was selected. Delete all contact variables because
+    # IS->customer_details() and IR->vendor_details() get the default
+    # contact anyway.
+    map({ delete($form->{$_}); } grep(/^cp_/, keys(%{ $form })));
   }
-  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";
+  my ($language_tc, $output_numberformat, $output_dateformat, $output_longdates);
+  if ($form->{"language_id"}) {
+    ($language_tc, $output_numberformat, $output_dateformat, $output_longdates) =
+      AM->get_language_details(\%myconfig, $form, $form->{language_id});
+  } else {
+    $output_dateformat = $myconfig{"dateformat"};
+    $output_numberformat = $myconfig{"numberformat"};
+    $output_longdates = 1;
   }
 
-  $form->format_string(@a);
-
   ($form->{employee}) = split /--/, $form->{employee};
-  ($form->{warehouse}, $form->{warehouse_id}) = split /--/, $form->{warehouse};
 
   # create the form variables
   if ($order) {
@@ -1577,8 +1743,11 @@ sub print_form {
     IS->invoice_details(\%myconfig, \%$form, $locale);
   }
 
-  map { $form->{$_} = $locale->date(\%myconfig, $form->{$_}, 1) }
-    ("${inv}date", "${due}date", "shippingdate");
+  $form->get_salesman(\%myconfig, $salesman_id_saved);
+
+  if ($form->{shipto_id}) {
+    $form->get_shipto(\%myconfig);
+  }
 
   @a = qw(name street zipcode city country);
 
@@ -1597,38 +1766,91 @@ sub print_form {
         || $form->{formname} eq 'request_quotation') {
       $form->{shiptoname}   = $myconfig{company};
       $form->{shiptostreet} = $myconfig{address};
-        } else {
+    } else {
       map { $form->{"shipto$_"} = $form->{$_} } @a;
     }
   }
 
   $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);
+  $form->{templates} = "$myconfig{templates}";
 
-  push @a, ("${inv}date", "${due}date", email, cc, bcc);
+  delete $form->{printer_command};
 
-  $form->format_string(@a);
+  $form->{language} = $form->get_template_language(\%myconfig);
+
+  my $printer_code;
+  if ($form->{media} ne 'email') {
+    $printer_code = $form->get_printer_code(\%myconfig);
+    if ($printer_code ne "") {
+      $printer_code = "_" . $printer_code;
+    }
+  }
 
-  $form->{templates} = "$myconfig{templates}";
   if ($form->{language} ne "") {
+    map({ $form->{"unit"}->[$_] =
+            AM->translate_units($form, $form->{"language"},
+                                $form->{"unit"}->[$_], $form->{"qty"}->[$_]); }
+        (0..scalar(@{$form->{"unit"}}) - 1));
     $form->{language} = "_" . $form->{language};
   }
 
-  $form->{IN} = "$form->{formname}$form->{language}.html";
+  # Format dates.
+  format_dates($output_dateformat, $output_longdates,
+               qw(invdate orddate quodate pldate duedate reqdate transdate
+                  shippingdate deliverydate validitydate paymentdate
+                  datepaid transdate_oe deliverydate_oe
+                  employee_startdate employee_enddate
+                  ),
+               grep({ /^datepaid_\d+$/ ||
+                        /^transdate_oe_\d+$/ ||
+                        /^deliverydate_oe_\d+$/ ||
+                        /^reqdate_\d+$/ ||
+                        /^deliverydate_\d+$/ ||
+                        /^transdate_\d+$/
+                    } keys(%{$form})));
+
+  reformat_numbers($output_numberformat, 2,
+                   qw(invtotal ordtotal quototal subtotal linetotal
+                      listprice sellprice netprice discount
+                      tax taxbase total paid),
+                   grep({ /^linetotal_\d+$/ ||
+                            /^listprice_\d+$/ ||
+                            /^sellprice_\d+$/ ||
+                            /^netprice_\d+$/ ||
+                            /^taxbase_\d+$/ ||
+                            /^discount_\d+$/ ||
+                            /^paid_\d+$/ ||
+                            /^subtotal_\d+$/ ||
+                            /^total_\d+$/ ||
+                            /^tax_\d+$/
+                        } keys(%{$form})));
+
+  reformat_numbers($output_numberformat, undef,
+                   qw(qty price_factor),
+                   grep({ /^qty_\d+$/
+                        } keys(%{$form})));
+
+  $form->{IN} = "$form->{formname}$form->{language}${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/;
   }
 
+  delete $form->{OUT};
+
   if ($form->{media} eq 'printer') {
-    $form->{OUT} = "| $myconfig{printer}";
+    $form->{OUT} = "| $form->{printer_command} &>/dev/null";
     $form->{printed} .= " $form->{formname}";
     $form->{printed} =~ s/^ //;
   }
@@ -1638,15 +1860,13 @@ sub print_form {
     $form->{subject} = qq|$form->{label} $form->{"${inv}number"}|
       unless $form->{subject};
 
-    $form->{OUT} = "$sendmail";
-
     $form->{emailed} .= " $form->{formname}";
     $form->{emailed} =~ s/^ //;
   }
   $emailed = $form->{emailed};
 
   if ($form->{media} eq 'queue') {
-    %queued = split / /, $form->{queued};
+    %queued = map { s|.*/|| } split / /, $form->{queued};
 
     if ($filename = $queued{ $form->{formname} }) {
       $form->{queued} =~ s/$form->{formname} $filename//;
@@ -1667,6 +1887,25 @@ sub print_form {
   }
   $queued = $form->{queued};
 
+# saving the history
+  if(!exists $form->{addition}) {
+    $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
+    if($form->{media} =~ /printer/) {
+    	$form->{addition} = "PRINTED";
+    }
+    elsif($form->{media} =~ /email/) {
+    	$form->{addition} = "MAILED";
+    }
+    elsif($form->{media} =~ /queue/) {
+    	$form->{addition} = "QUEUED";
+    }
+    elsif($form->{media} =~ /screen/) {
+    	$form->{addition} = "SCREENED";
+    }
+    $form->save_history($form->dbconnect(\%myconfig));
+  }
+  # /saving the history
+
   $form->parse_template(\%myconfig, $userspath);
 
   $form->{callback} = "";
@@ -1682,6 +1921,8 @@ sub print_form {
     $form->update_status(\%myconfig)
       if ($form->{media} eq 'queue' && $form->{id});
 
+    return $lxdebug->leave_sub() if ($old_form eq "return");
+
     if ($old_form) {
 
       $old_form->{"${inv}number"} = $form->{"${inv}number"};
@@ -1705,7 +1946,7 @@ sub print_form {
         } qw(paid exchangerate);
       }
 
-      &{"$display_form"};
+      call_sub($display_form);
       exit;
     }
 
@@ -1714,8 +1955,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}) {
+   call_sub($display_form);
+   exit; 
   }
 
   $lxdebug->leave_sub();
@@ -1723,14 +1966,14 @@ sub print_form {
 
 sub customer_details {
   $lxdebug->enter_sub();
-  IS->customer_details(\%myconfig, \%$form);
+  IS->customer_details(\%myconfig, \%$form, @_);
   $lxdebug->leave_sub();
 }
 
 sub vendor_details {
   $lxdebug->enter_sub();
 
-  IR->vendor_details(\%myconfig, \%$form);
+  IR->vendor_details(\%myconfig, \%$form, @_);
 
   $lxdebug->leave_sub();
 }
@@ -1758,8 +2001,17 @@ sub ship_to {
   map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
     qw(exchangerate creditlimit creditremaining);
 
+  my @shipto_vars =
+    qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry
+       shiptocontact shiptophone shiptofax shiptoemail
+       shiptodepartment_1 shiptodepartment_2);
+
+  my @addr_vars =
+    (qw(name department_1 department_2 street zipcode city country
+        contact email phone fax));
+
   # get details for name
-  &{"$form->{vc}_details"};
+  call_sub("$form->{vc}_details", @addr_vars);
 
   $number =
     ($form->{vc} eq 'customer')
@@ -1781,92 +2033,102 @@ sub ship_to {
   print qq|
 <body>
 
-<form method=post action=$form->{script}>
+<form method="post" action="$form->{script}">
 
-<table width=100%>
+<table width="100%">
   <tr>
     <td>
       <table>
-	<tr class=listheading>
-	  <th class=listheading colspan=2 width=50%>|
+	<tr class="listheading">
+	  <th class="listheading" colspan="2" width="50%">|
     . $locale->text('Billing Address') . qq|</th>
-	  <th class=listheading width=50%>|
+	  <th class="listheading" width="50%">|
     . $locale->text('Shipping Address') . qq|</th>
 	</tr>
 	<tr height="5"></tr>
 	<tr>
-	  <th align=right nowrap>$number</th>
+	  <th align="right" nowrap>$number</th>
 	  <td>$form->{"$form->{vc}number"}</td>
 	</tr>
 	<tr>
-	  <th align=right nowrap>| . $locale->text('Company Name') . qq|</th>
+	  <th align="right" nowrap>| . $locale->text('Company Name') . qq|</th>
 	  <td>$form->{name}</td>
-	  <td><input name=shiptoname size=35 value="$form->{shiptoname}"></td>
+	  <td><input name="shiptoname" size="35" value="$form->{shiptoname}"></td>
+	</tr>
+	<tr>
+	  <th align="right" nowrap>| . $locale->text('Department') . qq|</th>
+	  <td>$form->{department_1}</td>
+	  <td><input name="shiptodepartment_1" size="35" value="$form->{shiptodepartment_1}"></td>
+	</tr>
+	<tr>
+	  <th align="right" nowrap>&nbsp;</th>
+	  <td>$form->{department_2}</td>
+	  <td><input name="shiptodepartment_2" size="35" value="$form->{shiptodepartment_2}"></td>
 	</tr>
 	<tr>
-	  <th align=right nowrap>| . $locale->text('Street') . qq|</th>
+	  <th align="right" nowrap>| . $locale->text('Street') . qq|</th>
 	  <td>$form->{street}</td>
-	  <td><input name=shiptostreet size=35 value="$form->{shiptostreet}"></td>
+	  <td><input name="shiptostreet" size="35" value="$form->{shiptostreet}"></td>
 	</tr>
 	<tr>
-	  <th align=right nowrap>| . $locale->text('Zipcode') . qq|</th>
+	  <th align="right" nowrap>| . $locale->text('Zipcode') . qq|</th>
 	  <td>$form->{zipcode}</td>
-	  <td><input name=shiptozipcode size=35 value="$form->{shiptozipcode}"></td>
+	  <td><input name="shiptozipcode" size="35" value="$form->{shiptozipcode}"></td>
 	</tr>
 	<tr>
-	  <th align=right nowrap>| . $locale->text('City') . qq|</th>
+	  <th align="right" nowrap>| . $locale->text('City') . qq|</th>
 	  <td>$form->{city}</td>
-	  <td><input name=shiptocity size=35 value="$form->{shiptocity}"></td>
+	  <td><input name="shiptocity" size="35" value="$form->{shiptocity}"></td>
 	</tr>
 	<tr>
-	  <th align=right nowrap>| . $locale->text('Country') . qq|</th>
+	  <th align="right" nowrap>| . $locale->text('Country') . qq|</th>
 	  <td>$form->{country}</td>
-	  <td><input name=shiptocountry size=35 value="$form->{shiptocountry}"></td>
+	  <td><input name="shiptocountry" size="35" value="$form->{shiptocountry}"></td>
 	</tr>
 	<tr>
-	  <th align=right nowrap>| . $locale->text('Contact') . qq|</th>
+	  <th align="right" nowrap>| . $locale->text('Contact') . qq|</th>
 	  <td>$form->{contact}</td>
-	  <td><input name=shiptocontact size=35 value="$form->{shiptocontact}"></td>
+	  <td><input name="shiptocontact" size="35" value="$form->{shiptocontact}"></td>
 	</tr>
 	<tr>
-	  <th align=right nowrap>| . $locale->text('Phone') . qq|</th>
-	  <td>$form->{"$form->{vc}phone"}</td>
-	  <td><input name=shiptophone size=20 value="$form->{shiptophone}"></td>
+	  <th align="right" nowrap>| . $locale->text('Phone') . qq|</th>
+	  <td>$form->{phone}</td>
+	  <td><input name="shiptophone" size="20" value="$form->{shiptophone}"></td>
 	</tr>
 	<tr>
-	  <th align=right nowrap>| . $locale->text('Fax') . qq|</th>
-	  <td>$form->{"$form->{vc}fax"}</td>
-	  <td><input name=shiptofax size=20 value="$form->{shiptofax}"></td>
+	  <th align="right" nowrap>| . $locale->text('Fax') . qq|</th>
+	  <td>$form->{fax}</td>
+	  <td><input name="shiptofax" size="20" value="$form->{shiptofax}"></td>
 	</tr>
 	<tr>
-	  <th align=right nowrap>| . $locale->text('E-mail') . qq|</th>
+	  <th align="right" nowrap>| . $locale->text('E-mail') . qq|</th>
 	  <td>$form->{email}</td>
-	  <td><input name=shiptoemail size=35 value="$form->{shiptoemail}"></td>
+	  <td><input name="shiptoemail" size="35" value="$form->{shiptoemail}"></td>
 	</tr>
       </table>
     </td>
   </tr>
 </table>
+| . $cgi->hidden("-name" => "nextsub", "-value" => $nextsub);
+;
+
 
-<input type=hidden name=nextsub value=$nextsub>
-|;
 
   # delete shipto
-  map { delete $form->{$_} }
-    qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax shiptoemail header);
+  map({ delete $form->{$_} } (@shipto_vars, qw(header)));
   $form->{title} = $title;
 
   foreach $key (keys %$form) {
     $form->{$key} =~ s/\"/&quot;/g;
-    print qq|<input type=hidden name=$key value="$form->{$key}">\n|;
+    print qq|<input type="hidden" name="$key" value="$form->{$key}">\n|;
   }
 
   print qq|
 
-<hr size=3 noshade>
+<hr size="3" noshade>
 
 <br>
-<input class=submit type=submit name=action value="|
+<input class="submit" type="submit" name="action" value="|
     . $locale->text('Continue') . qq|">
 </form>
 
@@ -1909,9 +2171,41 @@ sub new_license {
   map { $form->{$_} = $form->escape($form->{$_}, 1) }
     qw(partnumber description);
   $form->{callback} =
-    qq|$form->{script}?login=$form->{login}&path=$form->{path}&password=$form->{password}&action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$name&type=$form->{type}&customer=$customer&partnumber=$form->{partnumber}&description=$form->{description}&previousform="$previousform"&initial=1|;
+    qq|$form->{script}?login=$form->{login}&password=$form->{password}&action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$name&type=$form->{type}&customer=$customer&partnumber=$form->{partnumber}&description=$form->{description}&previousform="$previousform"&initial=1|;
   $form->redirect;
 
   $lxdebug->leave_sub();
 }
 
+sub relink_accounts {
+  $lxdebug->enter_sub();
+
+  $form->{"taxaccounts"} =~ s/\s*$//;
+  $form->{"taxaccounts"} =~ s/^\s*//;
+  foreach my $accno (split(/\s*/, $form->{"taxaccounts"})) {
+    map({ delete($form->{"${accno}_${_}"}); } qw(rate description taxnumber));
+  }
+  $form->{"taxaccounts"} = "";
+
+  for (my $i = 1; $i <= $form->{"rowcount"}; $i++) {
+    if ($form->{"id_$i"}) {
+      IC->retrieve_accounts(\%myconfig, $form, $form->{"id_$i"}, $i, 1);
+    }
+  }
+
+  $lxdebug->leave_sub();
+}
+
+sub set_duedate {
+  $lxdebug->enter_sub();
+
+  $form->get_duedate(\%myconfig);
+
+  my $q = new CGI;
+  $result = "$form->{duedate}";
+  print $q->header();
+  print $result;
+  $lxdebug->leave_sub();
+
+}
+