X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Foe.pl;h=a89de30c01593c8333f2860ffa724d382a8883fa;hb=723b79bdf889207b36f5ab0edcfd4a6d81c6f8b6;hp=aabb659d4d1484e191c0a7e2198ce27c0c3293b0;hpb=222c7e21002f029efe1e9af5579b8464187a1a53;p=kivitendo-erp.git

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index aabb659d4..a89de30c0 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -1,4 +1,4 @@
-# #=====================================================================
+#=====================================================================
 # LX-Office ERP
 # Copyright (C) 2004
 # Based on SQL-Ledger Version 2.1.9
@@ -30,15 +30,19 @@
 # Order entry module
 # Quotation module
 #======================================================================
-use Data::Dumper;
+
+use POSIX qw(strftime);
 
 use SL::OE;
 use SL::IR;
 use SL::IS;
 use SL::PE;
+use SL::ReportGenerator;
+use List::Util qw(max reduce);
 
-require "$form->{path}/io.pl";
-require "$form->{path}/arap.pl";
+require "bin/mozilla/io.pl";
+require "bin/mozilla/arap.pl";
+require "bin/mozilla/reportgenerator.pl";
 
 1;
 
@@ -98,7 +102,7 @@ sub add {
   set_headings("add");
 
   $form->{callback} =
-    "$form->{script}?action=add&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&path=$form->{path}&password=$form->{password}"
+    "$form->{script}?action=add&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}"
     unless $form->{callback};
 
   &order_links;
@@ -110,26 +114,29 @@ sub add {
 
 sub edit {
   $lxdebug->enter_sub();
+  # show history button
+  $form->{javascript} = qq|<script type="text/javascript" src="js/show_history.js"></script>|;
+  #/show hhistory button
 
   $form->{simple_save} = 0;
 
   set_headings("edit");
 
   # editing without stuff to edit? try adding it first
-  if ($form->{rowcount}) {
-    map { $id++ if $form->{"id_$_"} } (1 .. $form->{rowcount});
+  if ($form->{rowcount} && !$form->{print_and_save}) {
+    map { $id++ if $form->{"multi_id_$_"} } (1 .. $form->{rowcount});
     if (!$id) {
 
       # reset rowcount
       undef $form->{rowcount};
       &add;
+      $lxdebug->leave_sub();
       return;
     }
-  } else {
-    if (!$form->{id}) {
-      &add;
-      return;
-    }
+  } elsif (!$form->{id}) {
+    &add;
+    $lxdebug->leave_sub();
+    return;
   }
 
   if ($form->{print_and_save}) {
@@ -154,15 +161,14 @@ sub edit {
 
 sub order_links {
   $lxdebug->enter_sub();
-
   # get customer/vendor
-  $form->all_vc(\%myconfig, $form->{vc},
-                ($form->{vc} eq 'customer') ? "AR" : "AP");
+  $form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP");
 
   # retrieve order/quotation
-  $form->{webdav} = $webdav;
-  # set jscalendar
-  $form->{jscalendar} = $jscalendar;
+  $form->{webdav}   = $webdav;
+  $form->{jsscript} = 1;
+
+  my $editing = $form->{id};
 
   OE->retrieve(\%myconfig, \%$form);
 
@@ -176,6 +182,8 @@ sub order_links {
     $taxzone_id = $form->{taxzone_id};
   }
 
+  $salesman_id = $form->{salesman_id} if ($editing);
+
 
   # if multiple rowcounts (== collective order) then check if the
   # there were more than one customer (in that case OE::retrieve removes
@@ -205,7 +213,7 @@ sub order_links {
   $intnotes = $form->{intnotes};
 
   # get customer / vendor
-  if ($form->{type} =~ /(purchase_order|request_quotation|receive_order)/) {
+  if ($form->{type} =~ /(purchase_order|request_quotation)/) {
     IR->get_vendor(\%myconfig, \%$form);
 
     #quote all_vendor Bug 133
@@ -214,7 +222,7 @@ sub order_links {
     }
 
   }
-  if ($form->{type} =~ /(sales|ship)_(order|quotation)/) {
+  if ($form->{type} =~ /sales_(order|quotation)/) {
     IS->get_customer(\%myconfig, \%$form);
 
     #quote all_vendor Bug 133
@@ -224,6 +232,7 @@ sub order_links {
 
   }
   $form->{cp_id} = $cp_id;
+
   if ($payment_id) {
     $form->{payment_id} = $payment_id;
   }
@@ -233,27 +242,19 @@ sub order_links {
   if ($taxzone_id) {
     $form->{taxzone_id} = $taxzone_id;
   }
-  $form->{intnotes} = $intnotes;
+  $form->{intnotes} = $intnotes if $intnotes;
   ($form->{ $form->{vc} }) = split /--/, $form->{ $form->{vc} };
-  $form->{"old$form->{vc}"} =
-    qq|$form->{$form->{vc}}--$form->{"$form->{vc}_id"}|;
+  $form->{"old$form->{vc}"} = qq|$form->{$form->{vc}}--$form->{"$form->{vc}_id"}|;
 
   # build the popup menus
   if (@{ $form->{"all_$form->{vc}"} }) {
     $form->{ $form->{vc} } =
       qq|$form->{$form->{vc}}--$form->{"$form->{vc}_id"}|;
-    map { $form->{"select$form->{vc}"} .= "<option>$_->{name}--$_->{id}\n" }
+    map { $form->{"select$form->{vc}"} .=
+"<option>$_->{name}--$_->{id}</option>\n" }
       (@{ $form->{"all_$form->{vc}"} });
   }
 
-  # currencies
-  @curr = split(/:/, $form->{currencies});
-  chomp $curr[0];
-  $form->{defaultcurrency} = $curr[0];
-  $form->{currency}        = $form->{defaultcurrency} unless $form->{currency};
-
-  map { $form->{selectcurrency} .= "<option>$_\n" } @curr;
-
   $form->{taxincluded} = $taxincluded if ($form->{id});
 
   # departments
@@ -262,64 +263,35 @@ sub order_links {
     $form->{department}       = "$form->{department}--$form->{department_id}";
 
     map {
-      $form->{selectdepartment} .=
-        "<option>$_->{description}--$_->{id}\n"
-    } (@{ $form->{all_departments} });
+      $form->{selectdepartment} .= "<option>$_->{description}--$_->{id}</option>\n"
+    } @{ $form->{all_departments} };
   }
 
   $form->{employee} = "$form->{employee}--$form->{employee_id}";
 
-  # sales staff
-  if (@{ $form->{all_employees} }) {
-    $form->{selectemployee} = "";
-    map { $form->{selectemployee} .= "<option>$_->{name}--$_->{id}\n" }
-      (@{ $form->{all_employees} });
-  }
-
   # forex
   $form->{forex} = $form->{exchangerate};
 
+  $form->{salesman_id} = $salesman_id if ($editing);
+
   $lxdebug->leave_sub();
 }
 
 sub prepare_order {
   $lxdebug->enter_sub();
-  $form->{media}    = "screen";
   $form->{formname} = $form->{type} unless $form->{formname};
 
   my $i = 0;
   foreach $ref (@{ $form->{form_details} }) {
     $form->{rowcount} = ++$i;
-
     map { $form->{"${_}_$i"} = $ref->{$_} } keys %{$ref};
   }
   for my $i (1 .. $form->{rowcount}) {
-    if ($form->{id}) {
-      $form->{"discount_$i"} =
-        $form->format_amount(\%myconfig, $form->{"discount_$i"} * 100);
-    } else {
-      $form->{"discount_$i"} =
-        $form->format_amount(\%myconfig, $form->{"discount_$i"});
-    }
-    ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/);
-    $dec           = length $dec;
-    $decimalplaces = ($dec > 2) ? $dec : 2;
-
-    # copy reqdate from deliverydate for invoice -> order conversion
-    $form->{"reqdate_$i"} = $form->{"deliverydate_$i"}
-      unless $form->{"reqdate_$i"};
-
-    $form->{"sellprice_$i"} =
-      $form->format_amount(\%myconfig, $form->{"sellprice_$i"},
-                           $decimalplaces);
-
-    (my $dec_qty) = ($form->{"qty_$i"} =~ /\.(\d+)/);
-    $dec_qty = length $dec_qty;
-    $form->{"qty_$i"} =
-      $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty);
-
-    map { $form->{"${_}_$i"} =~ s/\"/&quot;/g }
-      qw(partnumber description unit);
+    $form->{"reqdate_$i"}   = $form->{"deliverydate_$i"} unless $form->{"reqdate_$i"};
+    $form->{"discount_$i"}  = $form->format_amount(\%myconfig, $form->{"discount_$i"} * ($form->{id} ? 100 : 1));
+    $form->{"sellprice_$i"} = $form->format_amount(\%myconfig, $form->{"sellprice_$i"});
+    $form->{"qty_$i"}       = $form->format_amount(\%myconfig, $form->{"qty_$i"});
+    map { $form->{"${_}_$i"} =~ s/\"/&quot;/g } qw(partnumber description unit);
   }
 
   $lxdebug->leave_sub();
@@ -327,982 +299,399 @@ sub prepare_order {
 
 sub form_header {
   $lxdebug->enter_sub();
+  my @custom_hiddens;
 
-  my $checkedclosed = $form->{"closed"} ? "checked" : "";
-  my $checkeddelivered = $form->{"delivered"} ? "checked" : "";
-
-  map { $form->{$_} =~ s/\"/&quot;/g }
-    qw(ordnumber quonumber shippingpoint shipvia notes intnotes shiptoname
-       shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact
-       shiptophone shiptofax shiptodepartment_1 shiptodepartment_2);
-
-  # use JavaScript Calendar or not
-  $form->{jsscript} = $form->{jscalendar};
-  $jsscript = "";
-
-  $payment = qq|<option value=""></option>|;
-  foreach $item (@{ $form->{payment_terms} }) {
-    if ($form->{payment_id} eq $item->{id}) {
-      $payment .= qq|<option value="$item->{id}" selected>$item->{description}</option>|;
-    } else {
-      $payment .= qq|<option value="$item->{id}">$item->{description}</option>|;
-    }
-  }
-  if ($form->{jsscript}) {
-
-    # with JavaScript Calendar
-    $button1 = qq|
-       <td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value=$form->{transdate}></td>
-       <td><input type=button name=transdate id="trigger1" value=|
-      . $locale->text('button') . qq|></td>
-      |;
-    $button2 = qq|
-       <td width="13"><input name=reqdate id=reqdate size=11 title="$myconfig{dateformat}" value=$form->{reqdate}></td>
-       <td width="4"><input type=button name=reqdate name=reqdate id="trigger2" value=|
-      . $locale->text('button') . qq|></td>
-     |;
-
-    #write Trigger
-    $jsscript =
-      Form->write_trigger(\%myconfig, "2", "transdate", "BL", "trigger1",
-                          "reqdate", "BL", "trigger2");
-
-  } else {
+  # Container for template variables. Unfortunately this has to be visible in form_footer too, so not my.
+  our %TMPL_VAR = ();
 
-    # without JavaScript Calendar
-    $button1 = qq|
-                              <td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value=$form->{transdate}></td>|;
-    $button2 = qq|
-                              <td width="13"><input name=reqdate id=reqdate size=11 title="$myconfig{dateformat}" value=$form->{reqdate}></td>|;
-  }
+  $form->{employee_id} = $form->{old_employee_id} if $form->{old_employee_id};
+  $form->{salesman_id} = $form->{old_salesman_id} if $form->{old_salesman_id};
 
-  if ($form->{id}) {
-    $openclosed = qq|
-      <tr>
-        <td colspan=2 align=center>
-          <input name="closed" id="closed" type="checkbox" class="checkbox" value="1" $checkedclosed>
-          <label for="closed">| . $locale->text('Closed') . qq|</label>
-|;
+  $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
 
-    if (($form->{"type"} eq "sales_order") ||
-        ($form->{"type"} eq "purchase_order")) {
-      $openclosed .= qq|
-          <input name="delivered" id="delivered" type="checkbox" class="checkbox" value="1" $checkeddelivered>
-          <label for="delivered">| . $locale->text('Delivered') . qq|</label>
-|;
-    }
+  $form->{employee_id} = $form->{old_employee_id} if $form->{old_employee_id};
+  $form->{salesman_id} = $form->{old_salesman_id} if $form->{old_salesman_id};
 
-    $openclosed .= qq|
-        </td>
-      </tr>
-|;
-  }
+  map { $form->{$_} = H($form->{$_}) }
+    qw(shippingpoint shipvia notes intnotes shiptoname
+       shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact
+       shiptophone shiptofax shiptodepartment_1 shiptodepartment_2);
+ 
+  # use JavaScript Calendar or not
+  $form->{jsscript} = 1;
+  $TMPL_VAR{button1} = qq|
+     <td nowrap><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value="$form->{transdate}" onBlur=\"check_right_date_format(this)\">
+      <input type=button name=transdate id="trigger1" value=| . $locale->text('button') . qq|></td>
+    |;
+  $TMPL_VAR{button2} = qq|
+     <td nowrap width="13"><input name=reqdate id=reqdate size=11 title="$myconfig{dateformat}" value="$form->{reqdate}" onBlur=\"check_right_date_format(this)\">
+      <input type=button name=reqdate name=reqdate id="trigger2" value=| . $locale->text('button') . qq|></td>
+   |;
+  #write Trigger
+  $TMPL_VAR{jsscript} = Form->write_trigger(\%myconfig, "2", "transdate", "BL", "trigger1", "reqdate", "BL", "trigger2");
+
+  # openclosed checkboxes
+  my @tmp;
+  push @tmp, sprintf qq|<input name="delivered" id="delivered" type="checkbox" class="checkbox" value="1" %s><label for="delivered">%s</label>|,
+                        $form->{"delivered"} ? "checked" : "",  $locale->text('Delivered') if $form->{"type"} =~ /_order$/;
+  push @tmp, sprintf qq|<input name="closed" id="closed" type="checkbox" class="checkbox" value="1" %s><label for="closed">%s</label>|,
+                        $form->{"closed"}    ? "checked" : "",  $locale->text('Closed')    if $form->{id};
+  $TMPL_VAR{openclosed} = sprintf qq|<tr><td colspan=%d align=center>%s</td></tr>\n|, 2 * scalar @tmp, join "\n", @tmp if @tmp;
 
   # set option selected
-  foreach $item ($form->{vc}, currency, department, employee) {
+  foreach $item ($form->{vc}, 'currency', 'department', ($form->{vc} eq "customer" ? 'customer' : 'vendor')) {
     $form->{"select$item"} =~ s/ selected//;
-    $form->{"select$item"} =~
-      s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
+    $form->{"select$item"} =~ s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
   }
 
   #quote select[customer|vendor] Bug 133
   $form->{"select$form->{vc}"} = $form->quote($form->{"select$form->{vc}"});
 
-  #build contacts
-  if ($form->{all_contacts}) {
+  #substitute \n and \r to \s (bug 543)
+  $form->{"select$form->{vc}"} =~ s/[\n\r]/&nbsp;/g;
+  
+  my @old_project_ids = ($form->{"globalproject_id"}, grep { $_ } map { $form->{"project_id_$_"} } 1..$form->{"rowcount"});
+
+  my $vc = $form->{vc} eq "customer" ? "customers" : "vendors";
+  $form->get_lists("contacts"      => "ALL_CONTACTS",
+                   "shipto"        => "ALL_SHIPTO",
+                   "projects"      => { "key"      => "ALL_PROJECTS",
+                                        "all"      => 0,
+                                        "old_id"   => \@old_project_ids },
+                   "employees"     => "ALL_EMPLOYEES",
+                   "salesmen"      => "ALL_SALESMEN",
+                   "taxzones"      => "ALL_TAXZONES",
+                   "payments"      => "ALL_PAYMENTS",
+                   "currencies"    => "ALL_CURRENCIES",
+                   $vc             => { key   => "ALL_" . uc($vc),
+                                        limit => $myconfig{vclimit} + 1 },
+                   "price_factors" => "ALL_PRICE_FACTORS");
+
+  # contacts
+  @values = ("", map { $_->{cp_id} } @{ $form->{ALL_CONTACTS} });
+  %labels = map { $_->{cp_id} => $_->{"cp_name"} . ($_->{cp_abteilung} ? " ($_->{cp_abteilung})" : "") } @{ $form->{ALL_CONTACTS} };
+  $TMPL_VAR{contact} = NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values, '-style' => 'width: 250px',
+                                            '-labels' => \%labels, '-default' => $form->{"cp_id"})) if scalar @values > 1;
+
+  # vendor/customer
+  @values = map { "$_->{name}--$_->{id}" } @{ $form->{uc "all_$form->{vc}s" } };
+  %labels = map { +"$_->{name}--$_->{id}" => $_->{name} } @{ $form->{uc "all_$form->{vc}s" } };
+  push @custom_hiddens, "$form->{vc}_id";
+  push @custom_hiddens, "old$form->{vc}";
+  push @custom_hiddens, "select$form->{vc}";
+  $TMPL_VAR{vc} = sprintf qq|<th align="right">%s</th><td>%s<input type="button" value="?" onclick="show_vc_details('$form->{vc}')"></td>|,
+       $locale->text(ucfirst $form->{vc}), 
+       ($myconfig{vclimit} <=  scalar(@values)) 
+        ? $cgi->textfield(-value => H($form->{"old$form->{vc}"} =~ /^(.*)\-\-.*$/), -name => $form->{vc}) 
+        : NTI($cgi->popup_menu('-name' => "$form->{vc}", '-default' => $form->{"old$form->{vc}"}, 
+                               '-onChange' => "document.getElementById('update_button').click();",
+                               '-values' => \@values, '-labels' => \%labels, '-style' => 'width: 250px'));
+
+  # payments (for footer)
+  @values = ("", map { $_->{id} } @{ $form->{ALL_PAYMENTS} });
+  %labels = map { $_->{id} => $_->{description} } @{ $form->{ALL_PAYMENTS} };
+  $TMPL_VAR{payments} = NTI($cgi->popup_menu('-name' => 'payment_id', '-values' => \@values, '-style' => 'width: 250px',
+                                             '-labels' => \%labels, '-default' => $form->{payment_id}));
+
+  # shipto
+  @values = ("", map { $_->{shipto_id} } @{ $form->{ALL_SHIPTO} });
+  $TMPL_VAR{ALL_SHIPTO} = $form->{ALL_SHIPTO};
+  for my $item ( @{ $TMPL_VAR{ALL_SHIPTO} }) {
+     $item->{label} = join "; ", grep { $_ } map { $item->{"shipto${_}" } } qw(name department_1 street city);
+  }
+  %labels = map { my $item=$_; $_->{shipto_id} => join "; ", grep { $_ } map { $item->{"shipto${_}" } } qw(name department_1 street city) } @{ $form->{ALL_SHIPTO} };
+  $TMPL_VAR{shipto} = NTI($cgi->popup_menu('-name' => 'shipto_id', '-values' => \@values, '-style' => 'width: 250px',
+                                           '-labels' => \%labels, '-default' => $form->{"shipto_id"})) if scalar @values > 1;
+
+  # projects
+  @values = ("", map { $_->{id} } @{ $form->{ALL_PROJECTS} });
+  %labels = map { $_->{id} => $_->{projectnumber} } @{ $form->{ALL_PROJECTS} };
+  $TMPL_VAR{globalprojectnumber} = NTI($cgi->popup_menu('-name' => 'globalproject_id', '-values' => \@values,
+                                                        '-labels' => \%labels, '-default' => $form->{"globalproject_id"}));
+  
+  # salesmen
+  @values = map { $_->{id} } @{ $form->{ALL_SALESMEN} };
+  %labels = map { $_->{id} => ($_->{name} || $_->{login}) } @{ $form->{ALL_SALESMEN} };
+  $TMPL_VAR{salesmen} = NTI($cgi->popup_menu('-name' => 'salesman_id', '-default' => $form->{"salesman_id"} ? $form->{"salesman_id"} : $form->{"employee_id"},
+                                             '-values' => \@values, '-labels' => \%labels)) if $form->{type} =~ /^sales_/ && scalar @values;
+
+  # employees
+  @values = map { $_->{id} } @{ $form->{ALL_EMPLOYEES} };
+  %labels = map { $_->{id} => $_->{name} || $_->{login} } @{ $form->{ALL_EMPLOYEES} };
+  $TMPL_VAR{employee} = NTI($cgi->popup_menu('-name' => 'employee_id', '-default' => $form->{"employee_id"},
+                                             '-values' => \@values, '-labels' => \%labels));
+
+  # taxzone
+  @values = map { $_->{id} } @{ $form->{ALL_TAXZONES} };
+  %labels = map { $_->{id} => $_->{description} } @{ $form->{ALL_TAXZONES} };
+  $TMPL_VAR{taxzone} = NTI($cgi->popup_menu('-name' => 'taxzone_id', '-default' => $form->{"taxzone_id"},
+                                            '-values' => \@values, '-labels' => \%labels, '-style' => 'width: 250px'));
+
+  # currencies and exchangerate
+  @values = map { $_ } @{ $form->{ALL_CURRENCIES} };
+  %labels = map { $_ => $_ } @{ $form->{ALL_CURRENCIES} };
+  $form->{currency}            = $form->{defaultcurrency} unless $form->{currency};
+  $TMPL_VAR{show_exchangerate} = $form->{currency} ne $form->{defaultcurrency} && $form->{exchangerate};
+  $TMPL_VAR{currencies}        = NTI($cgi->popup_menu('-name' => 'currency', '-default' => $form->{"currency"},
+                                                      '-values' => \@values, '-labels' => \%labels)) if scalar @values;
+  push @custom_hiddens, "forex";
+  push @custom_hiddens, "exchangerate" if $form->{forex};
+
+  # credit remaining
+  $creditwarning = (($form->{creditlimit} != 0) && ($form->{creditremaining} < 0) && !$form->{update}) ? 1 : 0;
+  $TMPL_VAR{is_credit_remaining_negativ} = ($form->{creditremaining} =~ /-/) ? "0" : "1";
+  
+  # business
+  $TMPL_VAR{business_label} = ($form->{vc} eq "customer" ? $locale->text('Customer type') : $locale->text('Vendor type'));
+
+  push @custom_hiddens, "ordnumber"      if $form->{type} =~ /_quotation$/;
+  push @custom_hiddens, "customer_klass" if $form->{vc} eq 'customer';
 
-    $form->{selectcontact} = "<option></option>";
-    foreach $item (@{ $form->{all_contacts} }) {
-      my $department = ($item->{cp_abteilung}) ? "--$item->{cp_abteilung}" : "";
-      if ($form->{cp_id} == $item->{cp_id}) {
-        $form->{selectcontact} .=
-          "<option value=$item->{cp_id} selected>$item->{cp_name}$department</option>";
-      } else {
-        $form->{selectcontact} .= "<option value=$item->{cp_id}>$item->{cp_name}$department</option>";
-      }
-    }
-  } else {
-    $form->{selectcontact} =~ s/ selected//g;
-    if ($form->{cp_id} ne "") {
-      $form->{selectcontact} =~ s/value=$form->{cp_id}/value=$form->{cp_id} selected/;
-    }
-  }
+  $credittext = $locale->text('Credit Limit exceeded!!!');
 
+  $onload = ($form->{resubmit} && ($form->{format} eq "html")) ? "window.open('about:blank','Beleg'); document.oe.target = 'Beleg';document.oe.submit()"
+          : ($form->{resubmit})                                ? "document.oe.submit()"
+          : ($creditwarning)                                   ? "alert('$credittext')"
+          :                                                      "focus()";
 
-  if (@{ $form->{SHIPTO} }) {
-    $form->{selectshipto} = "<option value=0></option>";
-    foreach $item (@{ $form->{SHIPTO} }) {
-      if ($item->{shipto_id} == $form->{shipto_id}) {
-        $form->{selectshipto} .=
-          "<option value=$item->{shipto_id} selected>$item->{shiptoname} $item->{shiptodepartment_1}</option>";
-      } else {
-        $form->{selectshipto} .=
-          "<option value=$item->{shipto_id}>$item->{shiptoname} $item->{shiptodepartment}</option>";
-      }
+  $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;
+  $onload .= qq|;setupPoints('|.   $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|;
+  $TMPL_VAR{onload} = $onload;
+  
+  $form->{javascript} .= qq|<script type="text/javascript" src="js/show_form_details.js"></script>|;
+  $form->{javascript} .= qq|<script type="text/javascript" src="js/show_history.js"></script>|;
+  $form->{javascript} .= qq|<script type="text/javascript" src="js/show_vc_details.js"></script>|;
 
-    }
-  } else {
-    $form->{selectshipto} = $form->unquote($form->{selectshipto});
-    $form->{selectshipto} =~ s/ selected//g;
-    if ($form->{shipto_id} ne "") {
-      $form->{selectshipto} =~ s/value=$form->{shipto_id}/value=$form->{shipto_id} selected/;
-    }
-  }
+  $form->header;
 
-  $shipto = qq|
-		<th align=right>| . $locale->text('Shipping Address') . qq|</th>
-		<td><select name=shipto_id style="width:200px;">$form->{selectshipto}</select></td>|;
-  $form->{selectshipto} = $form->quote($form->{selectshipto});
-  $shipto .= qq| <input type=hidden name=selectshipto value="$form->{selectshipto}">|;
+  $TMPL_VAR{HIDDENS} = [ map { name => $_, value => $form->{$_} },
+     qw(id action type vc formname media format proforma queued printed emailed
+        title creditlimit creditremaining tradediscount business
+        max_dunning_level dunning_amount shiptoname shiptostreet shiptozipcode
+        shiptocity shiptocountry shiptocontact shiptophone shiptofax
+        shiptodepartment_1 shiptodepartment_2 shiptoemail
+        message email subject cc bcc taxpart taxservice taxaccounts),
+        @custom_hiddens,
+        map { $_.'_rate', $_.'_description' } split / /, $form->{taxaccounts} ];  # deleted: discount
+
+  %TMPL_VAR = (
+     %TMPL_VAR,
+     is_sales        => scalar ($form->{type} =~ /^sales_/),              # these vars are exported, so that the template
+     is_order        => scalar ($form->{type} =~ /_order$/),              # may determine what to show
+     is_sales_quo    => scalar ($form->{type} =~ /sales_quotation$/),
+     is_req_quo      => scalar ($form->{type} =~ /request_quotation$/),
+     is_sales_ord    => scalar ($form->{type} =~ /sales_order$/),
+     is_pur_ord      => scalar ($form->{type} =~ /purchase_order$/),
+  );
 
+  print $form->parse_html_template2("oe/orders_header", { %TMPL_VAR });
 
+  $lxdebug->leave_sub();
+}
 
-  $form->{exchangerate} =
-    $form->format_amount(\%myconfig, $form->{exchangerate});
+sub form_footer {
+  $lxdebug->enter_sub();
 
-  if (($form->{creditlimit} != 0) && ($form->{creditremaining} < 0) && !$form->{update}) {
-    $creditwarning = 1;
-  } else {
-    $creditwarning = 0;
-  }
+  $form->{invtotal} = $form->{invsubtotal};
 
-  $form->{creditlimit} =
-    $form->format_amount(\%myconfig, $form->{creditlimit}, 0, "0");
-  $form->{creditremaining} =
-    $form->format_amount(\%myconfig, $form->{creditremaining}, 0, "0");
+  $rows    = max 2, $form->numtextrows($form->{notes}, 25, 8);
+  $introws = max 2, $form->numtextrows($form->{intnotes}, 35, 8);
+  $rows    = max $rows, $introws;
 
-  $contact =
-    ($form->{selectcontact})
-    ? qq|<select name=cp_id>$form->{selectcontact}</select>\n<input type=hidden name="selectcontact" value="$form->{selectcontact}">|
-    : qq|<input name=contact value="$form->{contact}" size=35>|;
+  $TMPL_VAR{notes} = qq|<textarea name=notes rows=$rows cols=25 wrap=soft>$form->{notes}</textarea>|;
+  $TMPL_VAR{intnotes} = qq|<textarea name=intnotes rows=$rows cols=35 wrap=soft>$form->{intnotes}</textarea>|;
 
-  $exchangerate = qq|
-<input type=hidden name=forex value=$form->{forex}>
-|;
+  if (!$form->{taxincluded}) {
 
-  if ($form->{currency} ne $form->{defaultcurrency}) {
-    if ($form->{forex}) {
-      $exchangerate .=
-          qq|<th align=right>|
-        . $locale->text('Exchangerate')
-        . qq|</th><td>$form->{exchangerate}</td>
-      <input type=hidden name=exchangerate value=$form->{exchangerate}>
-|;
-    } else {
-      $exchangerate .=
-          qq|<th align=right>|
-        . $locale->text('Exchangerate')
-        . qq|</th><td><input name=exchangerate size=10 value=$form->{exchangerate}></td>|;
-    }
-  }
+    foreach $item (split / /, $form->{taxaccounts}) {
+      if ($form->{"${item}_base"}) {
+        $form->{invtotal} += $form->{"${item}_total"} = $form->round_amount( $form->{"${item}_base"} * $form->{"${item}_rate"}, 2);
+        $form->{"${item}_total"} = $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2);
 
-  $vclabel = ucfirst $form->{vc};
-  $vclabel = $locale->text($vclabel);
+        $TMPL_VAR{tax} .= qq|
+	      <tr>
+		<th align=right>$form->{"${item}_description"}&nbsp;| . $form->{"${item}_rate"} * 100 .qq|%</th>
+		<td align=right>$form->{"${item}_total"}</td>
+	      </tr> |;
+      }
+    }
 
+    $form->{invsubtotal} = $form->format_amount(\%myconfig, $form->{invsubtotal}, 2, 0);
 
+  } else {
+    foreach $item (split / /, $form->{taxaccounts}) {
+      if ($form->{"${item}_base"}) {
+        $form->{"${item}_total"} = $form->round_amount( ($form->{"${item}_base"} * $form->{"${item}_rate"} / (1 + $form->{"${item}_rate"})), 2);
+        $form->{"${item}_netto"} = $form->round_amount( ($form->{"${item}_base"} - $form->{"${item}_total"}), 2);
+        $form->{"${item}_total"} = $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2);
+        $form->{"${item}_netto"} = $form->format_amount(\%myconfig, $form->{"${item}_netto"}, 2);
 
-  if ($form->{business}) {
-    $business = qq|
+        $TMPL_VAR{tax} .= qq|
 	      <tr>
-		<th align=right>| . $locale->text('Business') . qq|</th>
-		<td>$form->{business}</td>
-		<th align=right>| . $locale->text('Trade Discount') . qq|</th>
-		<td>|
-      . $form->format_amount(\%myconfig, $form->{tradediscount} * 100)
-      . qq| %</td>
+		<th align=right>Enthaltene $form->{"${item}_description"}&nbsp;| . $form->{"${item}_rate"} * 100 .qq|%</th>
+		<td align=right>$form->{"${item}_total"}</td>
 	      </tr>
-|;
-  }
-
-  if ($form->{max_dunning_level}) {
-    $dunning = qq|
 	      <tr>
-                <td colspan=4>
-                <table>
-                  <tr>
-		<th align=right>| . $locale->text('Max. Dunning Level') . qq|:</th>
-		<td><b>$form->{max_dunning_level}</b></td>
-		<th align=right>| . $locale->text('Dunning Amount') . qq|:</th>
-		<td><b>|
-      . $form->format_amount(\%myconfig, $form->{dunning_amount},2)
-      . qq|</b></td>
-	      </tr>
-              </table>
-             </td>
-            </tr>
-|;
-  }
-
-  if (@{ $form->{TAXZONE} }) {
-    $form->{selecttaxzone} = "";
-    foreach $item (@{ $form->{TAXZONE} }) {
-      if ($item->{id} == $form->{taxzone_id}) {
-        $form->{selecttaxzone} .=
-          "<option value=$item->{id} selected>" . H($item->{description}) .
-          "</option>";
-      } else {
-        $form->{selecttaxzone} .=
-          "<option value=$item->{id}>" . H($item->{description}) . "</option>";
+	        <th align=right>Nettobetrag</th>
+		<td align=right>$form->{"${item}_netto"}</td>
+	      </tr> |;
       }
-
-    }
-  } else {
-    $form->{selecttaxzone} =~ s/ selected//g;
-    if ($form->{taxzone_id} ne "") {
-      $form->{selecttaxzone} =~ s/value=$form->{taxzone_id}>/value=$form->{taxzone_id} selected>/;
     }
   }
 
-  $taxzone = qq|
-	      <tr>
-		<th align=right>| . $locale->text('Steuersatz') . qq|</th>
-		<td><select name=taxzone_id>$form->{selecttaxzone}</select></td>
-		<input type=hidden name=selecttaxzone value="$form->{selecttaxzone}">
-	      </tr>|;
+  $form->{oldinvtotal} = $form->{invtotal};
 
+  print $form->parse_html_template2("oe/orders_footer", {
+     %TMPL_VAR,
+     webdav          => $webdav,
+     print_options   => print_options(inline => 1),
+     label_edit      => $locale->text("Edit the $form->{type}"),
+     label_workflow  => $locale->text("Workflow $form->{type}"),
+  });
 
-  if ($form->{type} !~ /_quotation$/) {
-    $ordnumber = qq|
-	      <tr>
-		<th width=70% align=right nowrap>| . $locale->text('Order Number') . qq|</th>
-                <td><input name=ordnumber size=11 value="$form->{ordnumber}"></td>
-	      </tr>
-	      <tr>
-		<th width=70% align=right nowrap>|
-      . $locale->text('Quotation Number') . qq|</th>
-                <td><input name=quonumber size=11 value="$form->{quonumber}"></td>
-	      </tr>
-              <tr>
-		<th width=70% align=right nowrap>|
-      . $locale->text('Customer Order Number') . qq|</th>
-                <td><input name=cusordnumber size=11 value="$form->{cusordnumber}"></td>
-	      </tr>
-	      <tr>
-		<th align=right nowrap>| . $locale->text('Order Date') . qq|</th>
-                $button1
+  $lxdebug->leave_sub();
+}
 
-	      </tr>
-	      <tr>
-		<th align=right nowrap=true>| . $locale->text('Required by') . qq|</th>
-                $button2
-	      </tr>
-|;
+sub update {
+  $lxdebug->enter_sub();
+  
+  my ($recursive_call) = shift;
 
-    $n = ($form->{creditremaining} =~ /-/) ? "0" : "1";
+  set_headings($form->{"id"} ? "edit" : "add");
+
+  map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(exchangerate creditlimit creditremaining) unless $recursive_call;
+  $form->{update} = 1;
+      
+  $payment_id = $form->{payment_id} if $form->{payment_id};
+  
+  &check_name($form->{vc});
+  
+  $form->{payment_id} = $payment_id if $form->{payment_id} eq "";
+  
+  $buysell              = 'buy';
+  $buysell              = 'sell' if ($form->{vc} eq 'vendor');
+  $form->{exchangerate} = $exchangerate if 
+    $form->{forex} = $exchangerate = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{transdate}, $buysell);
+
+  $exchangerate = $form->{exchangerate} || 1;
+
+##################### process items ######################################
+  # for pricegroups
+  $i = $form->{rowcount};
+  if (   ($form->{"partnumber_$i"} eq "")
+      && ($form->{"description_$i"} eq "")
+      && ($form->{"partsgroup_$i"}  eq "")) {
+
+    $form->{creditremaining} += ($form->{oldinvtotal} - $form->{oldtotalpaid});
+    &check_form;
 
-    $creditremaining = qq|
-	      <tr>
-		<td></td>
-		<td colspan=3>
-		  <table>
-		    <tr>
-		      <th nowrap>| . $locale->text('Credit Limit') . qq|</th>
-		      <td>$form->{creditlimit}</td>
-		      <td width=20%></td>
-		      <th nowrap>| . $locale->text('Remaining') . qq|</th>
-		      <td class="plus$n" nowrap>$form->{creditremaining}</td>
-		    </tr>
-		  </table>
-		</td>
-                $shipto
-	      </tr>
-|;
   } else {
-    $reqlabel =
-      ($form->{type} eq 'sales_quotation')
-      ? $locale->text('Valid until')
-      : $locale->text('Required by');
-    if ($form->{type} eq 'sales_quotation') {
-      $ordnumber = qq|
-	      <tr>
-		<th width=70% align=right nowrap>|
-        . $locale->text('Quotation Number') . qq|</th>
-		<td><input name=quonumber size=11 value="$form->{quonumber}"></td>
-		<input type=hidden name=ordnumber value="$form->{ordnumber}">
-	      </tr>
-|;
-    } else {
-      $ordnumber = qq|
-	      <tr>
-		<th width=70% align=right nowrap>| . $locale->text('RFQ Number') . qq|</th>
-		<td><input name=quonumber size=11 value="$form->{quonumber}"></td>
-		<input type=hidden name=ordnumber value="$form->{ordnumber}">
-	      </tr>
-|;
 
+    if ($form->{type} =~ /^sales/) {
+      IS->retrieve_item(\%myconfig, \%$form);
+    } else {
+      IR->retrieve_item(\%myconfig, \%$form);
     }
 
-    $ordnumber .= qq|
-	      <tr>
-		<th align=right nowrap>| . $locale->text('Quotation Date') . qq|</th>
-                $button1
-              </tr>
-	      <tr>
-		<th align=right nowrap=true>$reqlabel</th>
-                $button2
-	      </tr>
-|;
-    $creditremaining = qq| <tr>
-                            <td colspan=4></td>
-                            $shipto
-                          </tr>|;
-  }
+    my $rows = scalar @{ $form->{item_list} };
 
-  $vc =
-    ($form->{"select$form->{vc}"})
-    ? qq|<select name=$form->{vc}>$form->{"select$form->{vc}"}</select>\n<input type=hidden name="select$form->{vc}" value="$form->{"select$form->{vc}"}">|
-    : qq|<input name=$form->{vc} value="$form->{$form->{vc}}" size=35>|;
+    $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{discount} * 100);
 
-  $department = qq|
-              <tr>
-	        <th align="right" nowrap>| . $locale->text('Department') . qq|</th>
-		<td colspan=3><select name=department>$form->{selectdepartment}</select>
-		<input type=hidden name=selectdepartment value="$form->{selectdepartment}">
-		</td>
-	      </tr>
-| if $form->{selectdepartment};
+    if ($rows) {
+      $form->{"qty_$i"} = 1 unless ($form->{"qty_$i"});
 
-  $employee = qq|
-              <input type=hidden name=employee value="$form->{employee}">
-|;
+      if ($rows > 1) {
 
-  if ($form->{type} eq 'sales_order') {
-    if ($form->{selectemployee}) {
-      $employee = qq|
-    <input type=hidden name=customer_klass value=$form->{customer_klass}>
- 	      <tr>
-	        <th align=right nowrap>| . $locale->text('Salesperson') . qq|</th>
-		<td colspan=2><select name=employee>$form->{selectemployee}</select></td>
-		<input type=hidden name=selectemployee value="$form->{selectemployee}">
-                <td></td>
-	      </tr>
-|;
-    }
-  } else {
-    $employee = qq|
-    <input type=hidden name=customer_klass value=$form->{customer_klass}>
- 	      <tr>
-	        <th align=right nowrap>| . $locale->text('Employee') . qq|</th>
-		<td colspan=2><select name=employee>$form->{selectemployee}</select></td>
-		<input type=hidden name=selectemployee value="$form->{selectemployee}">
-                <td></td>
-	      </tr>
-|;
-  }
-  if ($form->{resubmit} && ($form->{format} eq "html")) {
-    $onload =
-      qq|window.open('about:blank','Beleg'); document.oe.target = 'Beleg';document.oe.submit()|;
-  } elsif ($form->{resubmit}) {
-    $onload = qq|document.oe.submit()|;
-  } else {
-    $onload = "fokus()";
-  }
+        &select_item;
+        exit;
 
-  $credittext = $locale->text('Credit Limit exceeded!!!');
-  if ($creditwarning) {
-    $onload = qq|alert('$credittext')|;
-  }
+      } else {
 
-  $form->{"javascript"} .= qq|<script type="text/javascript" src="js/show_form_details.js"></script>|;
+        $sellprice             = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"});
+        $form->{"discount_$i"} = 0 if $form->{"not_discountable_$i"};
+        map { $form->{item_list}[$i]{$_} =~ s/\"/&quot;/g }    qw(partnumber description unit);
+        map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} } keys %{ $form->{item_list}[0] };
+        $form->{payment_id} = $form->{"part_payment_id_$i"} if $form->{"part_payment_id_$i"} ne "";
 
-  $form->header;
+        $form->{"marge_price_factor_$i"} = $form->{item_list}->[0]->{price_factor};
 
-  print qq|
-<body onLoad="$onload">
+        ($sellprice || $form->{"sellprice_$i"}) =~ /\.(\d+)/;
+        $decimalplaces = max 2, length $1;
 
-<form method=post name=oe action=$form->{script}>
- <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/delivery_customer_selection.js"></script>
- <script type="text/javascript" src="js/vendor_selection.js"></script>
- <script type="text/javascript" src="js/calculate_qty.js"></script>
+        if ($sellprice) {
+          $form->{"sellprice_$i"} = $sellprice;
+        } else {
+          $form->{"sellprice_$i"} *= (1 - $form->{tradediscount});
+          $form->{"sellprice_$i"} /= $exchangerate;   # if there is an exchange rate adjust sellprice
+        }
 
-<input type=hidden name=id value=$form->{id}>
-<input type=hidden name=action value=$form->{action}>
+        $amount = $form->{"sellprice_$i"} * $form->{"qty_$i"} * (1 - $form->{"discount_$i"} / 100);
+        map { $form->{"${_}_base"} = 0 }                                 split / /, $form->{taxaccounts};
+        map { $form->{"${_}_base"} += $amount }                          split / /, $form->{"taxaccounts_$i"};
+        map { $amount += ($form->{"${_}_base"} * $form->{"${_}_rate"}) } split / /, $form->{taxaccounts} if !$form->{taxincluded};
 
-<input type=hidden name=type value=$form->{type}>
-<input type=hidden name=formname value=$form->{formname}>
-<input type=hidden name=media value=$form->{media}>
-<input type=hidden name=format value=$form->{format}>
-<input type=hidden name=proforma value=$form->{proforma}>
+        $form->{creditremaining} -= $amount;
 
-<input type=hidden name=queued value="$form->{queued}">
-<input type=hidden name=printed value="$form->{printed}">
-<input type=hidden name=emailed value="$form->{emailed}">
+        $form->{"sellprice_$i"} = $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces);
+        $form->{"qty_$i"}       = $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty);
 
-<input type=hidden name=vc value=$form->{vc}>
+        # get pricegroups for parts
+        IS->get_pricegroups_for_parts(\%myconfig, \%$form);
 
-<input type=hidden name=title value="$form->{title}">
+        # build up html code for prices_$i
+        &set_pricegroup($i);
+      }
 
-<input type=hidden name=discount value=$form->{discount}>
-<input type=hidden name=creditlimit value=$form->{creditlimit}>
-<input type=hidden name=creditremaining value=$form->{creditremaining}>
+      display_form();
+    } else {
 
-<input type=hidden name=tradediscount value=$form->{tradediscount}>
-<input type=hidden name=business value=$form->{business}>
-<input type=hidden name=webdav value=$webdav>
+      # ok, so this is a new part
+      # ask if it is a part or service item
 
-<table width=100%>
-  <tr class=listtop>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>
-      <table width="100%">
-        <tr valign=top>
-	  <td>
-	    <table width=100%>
-	      <tr>
-		<th align=right>$vclabel</th>
-		<td colspan=3>$vc</td>
-		<input type=hidden name=$form->{vc}_id value=$form->{"$form->{vc}_id"}>
-		<input type=hidden name="old$form->{vc}" value="$form->{"old$form->{vc}"}">
-                <th align=richt nowrap>|
-    . $locale->text('Contact Person') . qq|</th>
-                <td colspan=3>$contact</td>
-	      </tr>
-	      $creditremaining
-	      $business
-              $dunning
-              $taxzone
-	      $department
-	      <tr>
-		<th align=right>| . $locale->text('Currency') . qq|</th>
-		<td><select name=currency>$form->{selectcurrency}</select></td>
-		<input type=hidden name=selectcurrency value="$form->{selectcurrency}">
-		<input type=hidden name=defaultcurrency value=$form->{defaultcurrency}>
-		$exchangerate
-	      </tr>
-	      <tr>
-		<th align=right>| . $locale->text('Shipping Point') . qq|</th>
-		<td colspan=3><input name=shippingpoint size=35 value="$form->{shippingpoint}"></td>
-	      </tr>
-	      <tr>
-		<th align=right>| . $locale->text('Ship via') . qq|</th>
-		<td colspan=3><input name=shipvia size=35 value="$form->{shipvia}"></td>
-	      </tr>|;
-#              <tr>
-#                 <td colspan=4>
-#                   <table>
-#                     <tr>
-#                       <td colspan=2>
-#                         <button type="button" onclick="delivery_customer_selection_window('delivery_customer_string','delivery_customer_id')">| . $locale->text('Choose Customer') . qq|</button>
-#                       </td>
-#                       <td colspan=2><input type=hidden name=delivery_customer_id value="$form->{delivery_customer_id}">
-#                       <input size=45 id=delivery_customer_string name=delivery_customer_string value="$form->{delivery_customer_string}"></td>
-#                     </tr>
-#                     <tr>
-#                       <td colspan=2>
-#                         <button type="button" onclick="vendor_selection_window('delivery_vendor_string','delivery_vendor_id')">| . $locale->text('Choose Vendor') . qq|</button>
-#                       </td>
-#                       <td colspan=2><input type=hidden name=delivery_vendor_id value="$form->{delivery_vendor_id}">
-#                       <input size=45 id=vendor_string name=delivery_vendor_string value="$form->{delivery_vendor_string}"></td>
-#                     </tr>
-#                   </table>
-#                 </td>
-#               </tr>
-print qq|	    </table>
-	  </td>
-	  <td align=right>
-	    <table>
-	      $openclosed
-	      $employee
-	      $ordnumber
-	    </table>
-	  </td>
-	</tr>
-      </table>
-    </td>
-  </tr>
+      if (   $form->{"partsgroup_$i"}
+          && ($form->{"partsnumber_$i"} eq "")
+          && ($form->{"description_$i"} eq "")) {
+        $form->{rowcount}--;
+        $form->{"discount_$i"} = "";
 
-$jsscript
+        display_form();
+      } else {
+        $form->{"id_$i"}   = 0;
+        new_item();
+      }
+    }
+  }
+##################### process items ######################################
 
-<!-- shipto are in hidden variables -->
-
-<input type=hidden name=shiptoname value="$form->{shiptoname}">
-<input type=hidden name=shiptostreet value="$form->{shiptostreet}">
-<input type=hidden name=shiptozipcode value="$form->{shiptozipcode}">
-<input type=hidden name=shiptocity value="$form->{shiptocity}">
-<input type=hidden name=shiptocountry value="$form->{shiptocountry}">
-<input type=hidden name=shiptocontact value="$form->{shiptocontact}">
-<input type=hidden name=shiptophone value="$form->{shiptophone}">
-<input type=hidden name=shiptofax value="$form->{shiptofax}">
-<input type=hidden name=shiptodepartment_1 value="$form->{shiptodepartment_1}">
-<input type=hidden name=shiptodepartment_2 value="$form->{shiptodepartment_2}">
-<input type=hidden name=shiptoemail value="$form->{shiptoemail}">
-
-<!-- email variables -->
-<input type=hidden name=message value="$form->{message}">
-<input type=hidden name=email value="$form->{email}">
-<input type=hidden name=subject value="$form->{subject}">
-<input type=hidden name=cc value="$form->{cc}">
-<input type=hidden name=bcc value="$form->{bcc}">
-
-<input type=hidden name=taxpart value="$form->{taxpart}">
-<input type=hidden name=taxservice value="$form->{taxservice}">
-
-<input type=hidden name=taxaccounts value="$form->{taxaccounts}">
-|;
 
-  foreach $item (split / /, $form->{taxaccounts}) {
-    print qq|
-<input type=hidden name="${item}_rate" value=$form->{"${item}_rate"}>
-<input type=hidden name="${item}_description" value="$form->{"${item}_description"}">
-|;
-  }
   $lxdebug->leave_sub();
 }
 
-sub form_footer {
+sub search {
   $lxdebug->enter_sub();
 
-  $form->{invtotal} = $form->{invsubtotal};
-
-  if (($rows = $form->numtextrows($form->{notes}, 25, 8)) < 2) {
-    $rows = 2;
-  }
-  if (($introws = $form->numtextrows($form->{intnotes}, 35, 8)) < 2) {
-    $introws = 2;
+  if ($form->{type} eq 'purchase_order') {
+    $form->{title} = $locale->text('Purchase Orders');
+    $form->{vc}    = 'vendor';
+    $ordlabel      = $locale->text('Order Number');
+    $ordnumber     = 'ordnumber';
+    $employee      = $locale->text('Employee');
   }
-  $rows = ($rows > $introws) ? $rows : $introws;
-  $notes =
-    qq|<textarea name=notes rows=$rows cols=25 wrap=soft>$form->{notes}</textarea>|;
-  $intnotes =
-    qq|<textarea name=intnotes rows=$rows cols=35 wrap=soft>$form->{intnotes}</textarea>|;
 
-  $form->{taxincluded} = ($form->{taxincluded}) ? "checked" : "";
+  if ($form->{type} eq 'request_quotation') {
+    $form->{title} = $locale->text('Request for Quotations');
+    $form->{vc}    = 'vendor';
+    $ordlabel      = $locale->text('RFQ Number');
+    $ordnumber     = 'quonumber';
+    $employee      = $locale->text('Employee');
+  }
 
-  $taxincluded = "";
-  if ($form->{taxaccounts}) {
-    $taxincluded = qq|
-	      <input name=taxincluded class=checkbox type=checkbox value=1 $form->{taxincluded}> <b>|
-      . $locale->text('Tax Included') . qq|</b><br><br>
-|;
-  }
-
-  if (!$form->{taxincluded}) {
-
-    foreach $item (split / /, $form->{taxaccounts}) {
-      if ($form->{"${item}_base"}) {
-        $form->{invtotal} += $form->{"${item}_total"} =
-          $form->round_amount(
-                             $form->{"${item}_base"} * $form->{"${item}_rate"},
-                             2);
-        $form->{"${item}_total"} =
-          $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2);
-
-        $tax .= qq|
-	      <tr>
-		<th align=right>$form->{"${item}_description"}</th>
-		<td align=right>$form->{"${item}_total"}</td>
-	      </tr>
-|;
-      }
-    }
-
-    $form->{invsubtotal} =
-      $form->format_amount(\%myconfig, $form->{invsubtotal}, 2, 0);
-
-    $subtotal = qq|
-	      <tr>
-		<th align=right>| . $locale->text('Subtotal') . qq|</th>
-		<td align=right>$form->{invsubtotal}</td>
-	      </tr>
-|;
-
-  }
-
-  if ($form->{taxincluded}) {
-    foreach $item (split / /, $form->{taxaccounts}) {
-      if ($form->{"${item}_base"}) {
-        $form->{"${item}_total"} =
-          $form->round_amount(
-                           ($form->{"${item}_base"} * $form->{"${item}_rate"} /
-                              (1 + $form->{"${item}_rate"})
-                           ),
-                           2);
-        $form->{"${item}_netto"} =
-          $form->round_amount(
-                          ($form->{"${item}_base"} - $form->{"${item}_total"}),
-                          2);
-        $form->{"${item}_total"} =
-          $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2);
-        $form->{"${item}_netto"} =
-          $form->format_amount(\%myconfig, $form->{"${item}_netto"}, 2);
-
-        $tax .= qq|
-	      <tr>
-		<th align=right>Enthaltene $form->{"${item}_description"}</th>
-		<td align=right>$form->{"${item}_total"}</td>
-	      </tr>
-	      <tr>
-	        <th align=right>Nettobetrag</th>
-		<td align=right>$form->{"${item}_netto"}</td>
-	      </tr>
-|;
-      }
-    }
-
-  }
-
-  $form->{oldinvtotal} = $form->{invtotal};
-  $form->{invtotal}    =
-    $form->format_amount(\%myconfig, $form->{invtotal}, 2, 0);
-
-  print qq|
-  <tr>
-    <td>
-      <table width=100%>
-	<tr valign=bottom>
-	  <td>
-	    <table>
-	      <tr>
-		<th align=left>| . $locale->text('Notes') . qq|</th>
-		<th align=left>| . $locale->text('Internal Notes') . qq|</th>
-	      </tr>
-	      <tr valign=top>
-		<td>$notes</td>
-		<td>$intnotes</td>
-	      </tr>
-	  <th align=right>| . $locale->text('Payment Terms') . qq|</th>
-	  <td><select name=payment_id tabindex=24>$payment
-                          </select></td>
-	    </table>
-	  </td>
-	  <td align=right width=100%>
-	    $taxincluded
-	    <table width=100%>
-	      $subtotal
-	      $tax
-	      <tr>
-		<th align=right>| . $locale->text('Total') . qq|</th>
-		<td align=right>$form->{invtotal}</td>
-	      </tr>
-	    </table>
-	  </td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-<input type=hidden name=oldinvtotal value=$form->{oldinvtotal}>
-<input type=hidden name=oldtotalpaid value=$totalpaid>
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-|;
-
-  if ($webdav) {
-    $webdav_list = qq|
-
-  <tr>
-    <th class=listtop align=left>Dokumente im Webdav-Repository</th>
-  </tr>
-    <table width=100%>
-      <td align=left width=30%><b>Dateiname</b></td>
-      <td align=left width=70%><b>Webdavlink</b></td>
-|;
-    foreach $file (keys %{ $form->{WEBDAV} }) {
-      $webdav_list .= qq|
-      <tr>
-        <td align=left>$file</td>
-        <td align=left><a href="$form->{WEBDAV}{$file}">$form->{WEBDAV}{$file}</a></td>
-      </tr>
-|;
-    }
-    $webdav_list .= qq|
-    </table>
-  </tr>
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-|;
-
-    print $webdav_list;
-  }
-  print qq|
-<input type=hidden name=jscalendar value=$form->{jscalendar}>
-|;
-  print qq|
-  <tr>
-    <td>
-|;
-  &print_options;
-
-  print qq|
-    </td>
-  </tr>
-</table>
-
-| . $locale->text("Edit the $form->{type}") . qq|<br>
-<input class=submit type=submit name=action id=update_button value="|
-    . $locale->text('Update') . qq|">
-<input class=submit type=submit name=action value="|
-    . $locale->text('Ship to') . qq|">
-<input class=submit type=submit name=action value="|
-    . $locale->text('Print') . qq|">
-<input class=submit type=submit name=action value="|
-    . $locale->text('E-mail') . qq|">
-<input class=submit type=submit name=action value="|
-    . $locale->text('Save') . qq|">
-<input class=submit type=submit name=action value="|
-    . $locale->text('Save and Close') . qq|">
-|;
-
-  if (($form->{id})) {
-    print qq|
-<br>| . $locale->text("Workflow $form->{type}") . qq|<br>
-<input class=submit type=submit name=action value="|
-      . $locale->text('Save as new') . qq|">
-<input class=submit type=submit name=action value="|
-      . $locale->text('Delete') . qq|">|;
-    if (($form->{type} =~ /sales_quotation$/)) {
-      print qq|
-<input class=submit type=submit name=action value="|
-        . $locale->text('Sales Order') . qq|">|;
-    }
-    if ($form->{type} =~ /request_quotation$/) {
-      print qq|
-<input class=submit type=submit name=action value="|
-        . $locale->text('Purchase Order') . qq|">|;
-    }
-    if (1) {
-    print qq|
-<input class=submit type=submit name=action value="|
-      . $locale->text('Invoice') . qq|">
-|;
-}
-
-    if ($form->{type} =~ /sales_order$/) {
-      print qq|
-<br>$form->{heading} als neue Vorlage verwenden f&uuml;r<br>
-<input class=submit type=submit name=action value="|
-        . $locale->text('Purchase Order') . qq|">
-<input class=submit type=submit name=action value="|
-        . $locale->text('Quotation') . qq|">
-|;
-
-    } elsif ($form->{type} =~ /purchase_order$/) {
-      print qq|
-<br>$form->{heading} als neue Vorlage verwenden f&uuml;r<br>
-<input class=submit type=submit name=action value="|
-        . $locale->text('Sales Order') . qq|">
-<input class=submit type=submit name=action value="|
-        . $locale->text('Request for Quotation') . qq|">
-|;
-
-    } else {
-      print qq|
-<br>$form->{heading} als neue Vorlage verwenden f&uuml;r<br>
-<input class=submit type=submit name=action value="|
-        . $locale->text('Order') . qq|">
-|;
-    }
-  } elsif ($form->{type} =~ /sales_order$/ && $form->{rowcount} && !$form->{proforma}) {
-    print qq|
-<br>Workflow  $form->{heading}<br>
-<input class=submit type=submit name=action value="|
-      . $locale->text('Save as new') . qq|">
-<input class=submit type=submit name=action value="|
-      . $locale->text('Invoice') . qq|">
-|;
-  }
-
-  print qq|
-
-<input type=hidden name=rowcount value=$form->{rowcount}>
-
-<input name=callback type=hidden value="$form->{callback}">
-
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
-</form>
-
-</body>
-</html>
-|;
-  $lxdebug->leave_sub();
-}
-
-sub update {
-  $lxdebug->enter_sub();
-
-  set_headings($form->{"id"} ? "edit" : "add");
-
-  map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
-    qw(exchangerate creditlimit creditremaining);
-  $form->{update} = 1;
-
-  &check_name($form->{vc});
-
-  &check_project;
-
-  $buysell              = 'buy';
-  $buysell              = 'sell' if ($form->{vc} eq 'vendor');
-  $form->{exchangerate} = $exchangerate
-    if (
-        $form->{forex} = (
-                  $exchangerate =
-                    $form->check_exchangerate(
-                    \%myconfig, $form->{currency}, $form->{transdate}, $buysell
-                    )));
-
-  # for pricegroups
-  $i = $form->{rowcount};
-
-  $exchangerate = ($form->{exchangerate}) ? $form->{exchangerate} : 1;
-
-  if (   ($form->{"partnumber_$i"} eq "")
-      && ($form->{"description_$i"} eq "")
-      && ($form->{"partsgroup_$i"}  eq "")) {
-
-    $form->{creditremaining} += ($form->{oldinvtotal} - $form->{oldtotalpaid});
-    &check_form;
-
-  } else {
-
-    if (   $form->{type} eq 'purchase_order'
-        || $form->{type} eq 'request_quotation') {
-      IR->retrieve_item(\%myconfig, \%$form);
-    }
-    if ($form->{type} eq 'sales_order' || $form->{type} eq 'sales_quotation') {
-      IS->retrieve_item(\%myconfig, \%$form);
-    }
-
-    my $rows = scalar @{ $form->{item_list} };
-
-    $form->{"discount_$i"} =
-      $form->format_amount(\%myconfig, $form->{discount} * 100);
-
-    if ($rows) {
-      $form->{"qty_$i"} = 1 unless ($form->{"qty_$i"});
-
-      if ($rows > 1) {
-
-        &select_item;
-        exit;
-
-      } else {
-
-        $sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"});
-        if ($form->{"not_discountable_$i"}) {
-          $form->{"discount_$i"} = 0;
-        }
-        map { $form->{item_list}[$i]{$_} =~ s/\"/&quot;/g }
-          qw(partnumber description unit);
-        map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} }
-          keys %{ $form->{item_list}[0] };
-        if ($form->{"part_payment_id_$i"} ne "") {
-          $form->{payment_id} = $form->{"part_payment_id_$i"};
-        }
-
-        $s = ($sellprice) ? $sellprice : $form->{"sellprice_$i"};
-
-        ($dec) = ($s =~ /\.(\d+)/);
-        $dec           = length $dec;
-        $decimalplaces = ($dec > 2) ? $dec : 2;
-
-        if ($sellprice) {
-          $form->{"sellprice_$i"} = $sellprice;
-        } else {
-
-          $form->{"sellprice_$i"} *= (1 - $form->{tradediscount});
-
-          # if there is an exchange rate adjust sellprice
-          $form->{"sellprice_$i"} /= $exchangerate;
-        }
-
-        $amount =
-          $form->{"sellprice_$i"} * $form->{"qty_$i"} *
-          (1 - $form->{"discount_$i"} / 100);
-        map { $form->{"${_}_base"} = 0 } (split / /, $form->{taxaccounts});
-        map { $form->{"${_}_base"} += $amount }
-          (split / /, $form->{"taxaccounts_$i"});
-        map { $amount += ($form->{"${_}_base"} * $form->{"${_}_rate"}) }
-          split / /, $form->{taxaccounts}
-          if !$form->{taxincluded};
-
-        $form->{creditremaining} -= $amount;
-
-        $form->{"sellprice_$i"} =
-          $form->format_amount(\%myconfig, $form->{"sellprice_$i"},
-                               $decimalplaces);
-        $form->{"qty_$i"} =
-          $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty);
-
-        # get pricegroups for parts
-        IS->get_pricegroups_for_parts(\%myconfig, \%$form);
-
-        # build up html code for prices_$i
-        &set_pricegroup($i);
-      }
-
-      &display_form;
-
-    } else {
-
-      # ok, so this is a new part
-      # ask if it is a part or service item
-
-      if (   $form->{"partsgroup_$i"}
-          && ($form->{"partsnumber_$i"} eq "")
-          && ($form->{"description_$i"} eq "")) {
-        $form->{rowcount}--;
-        $form->{"discount_$i"} = "";
-        &display_form;
-      } else {
-
-        $form->{"id_$i"}   = 0;
-        $form->{"unit_$i"} = $locale->text('ea');
-
-        &new_item;
-
-      }
-    }
-  }
-
-  $lxdebug->leave_sub();
-}
-
-sub search {
-  $lxdebug->enter_sub();
-
-  if ($form->{type} eq 'purchase_order') {
-    $form->{title} = $locale->text('Purchase Orders');
-    $form->{vc}    = 'vendor';
-    $ordlabel      = $locale->text('Order Number');
-    $ordnumber     = 'ordnumber';
-    $employee      = $locale->text('Employee');
-  }
-  if ($form->{type} eq 'request_quotation') {
-    $form->{title} = $locale->text('Request for Quotations');
-    $form->{vc}    = 'vendor';
-    $ordlabel      = $locale->text('RFQ Number');
-    $ordnumber     = 'quonumber';
-    $employee      = $locale->text('Employee');
-  }
-  if ($form->{type} eq 'receive_order') {
-    $form->{title} = $locale->text('Receive Merchandise');
-    $form->{vc}    = 'vendor';
-    $ordlabel      = $locale->text('Order Number');
-    $ordnumber     = 'ordnumber';
-    $employee      = $locale->text('Employee');
-  }
   if ($form->{type} eq 'sales_order') {
     $form->{title} = $locale->text('Sales Orders');
     $form->{vc}    = 'customer';
     $ordlabel      = $locale->text('Order Number');
     $ordnumber     = 'ordnumber';
-    $employee      = $locale->text('Salesperson');
-  }
-  if ($form->{type} eq 'ship_order') {
-    $form->{title} = $locale->text('Ship Merchandise');
-    $form->{vc}    = 'customer';
-    $ordlabel      = $locale->text('Order Number');
-    $ordnumber     = 'ordnumber';
-    $employee      = $locale->text('Salesperson');
-
+    $employee      = $locale->text('Employee');
   }
 
   if ($form->{type} eq 'sales_quotation') {
@@ -1313,55 +702,17 @@ sub search {
     $employee      = $locale->text('Employee');
   }
 
-  if ($form->{type} =~ /(ship|receive)_order/) {
-    OE->get_warehouses(\%myconfig, \%$form);
-
-    # warehouse
-    if (@{ $form->{all_warehouses} }) {
-      $form->{selectwarehouse} = "<option>\n";
-      $form->{warehouse}       = qq|$form->{warehouse}--$form->{warehouse_id}|;
-
-      map {
-        $form->{selectwarehouse} .=
-          "<option>$_->{description}--$_->{id}\n"
-      } (@{ $form->{all_warehouses} });
-
-      $warehouse = qq|
-	      <tr>
-		<th align=right>| . $locale->text('Warehouse') . qq|</th>
-		<td colspan=3><select name=warehouse>$form->{selectwarehouse}</select></td>
-		<input type=hidden name=selectwarehouse value="$form->{selectwarehouse}">
-	      </tr>
-|;
-
-    }
-  }
-
   # setup vendor / customer selection
   $form->all_vc(\%myconfig, $form->{vc},
                 ($form->{vc} eq 'customer') ? "AR" : "AP");
 
-  map { $vc .= "<option>$_->{name}--$_->{id}\n" }
-    @{ $form->{"all_$form->{vc}"} };
-
-  $vclabel = ucfirst $form->{vc};
-  $vclabel = $locale->text($vclabel);
-
-  # $locale->text('Vendor')
-  # $locale->text('Customer')
-
-  $vc =
-    ($vc)
-    ? qq|<select name=$form->{vc}><option>\n$vc</select>|
-    : qq|<input name=$form->{vc} size=35>|;
-
   # departments
   if (@{ $form->{all_departments} }) {
     $form->{selectdepartment} = "<option>\n";
 
     map {
       $form->{selectdepartment} .=
-        "<option>$_->{description}--$_->{id}\n"
+        "<option>$_->{description}--$_->{id}</option>\n"
     } (@{ $form->{all_departments} });
   }
 
@@ -1372,22 +723,6 @@ sub search {
 	</tr>
 | if $form->{selectdepartment};
 
-  if ($form->{type} !~ /(ship_order|receive_order)/) {
-    $openclosed = qq|
-	      <tr>
-	        <td><input name="open" class=checkbox type=checkbox value=1 checked> |
-      . $locale->text('Open') . qq|</td>
-	        <td><input name="closed" class=checkbox type=checkbox value=1 $form->{closed}> |
-      . $locale->text('Closed') . qq|</td>
-	      </tr>
-|;
-  } else {
-
-    $openclosed = qq|
-	        <input type=hidden name="open" value=1>
-|;
-  }
-
   my $delivered;
   if (($form->{"type"} eq "sales_order") ||
       ($form->{"type"} eq "purchase_order")) {
@@ -1402,35 +737,91 @@ sub search {
   }
 
   # use JavaScript Calendar or not
-  $form->{jsscript} = $jscalendar;
+  $form->{jsscript} = 1;
   $jsscript = "";
-  if ($form->{jsscript}) {
-
-    # with JavaScript Calendar
-    $button1 = qq|
-       <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}">
-       <input type=button name=transdatefrom id="trigger3" value=|
-      . $locale->text('button') . qq|></td>
-      |;
-    $button2 = qq|
-       <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}">
-       <input type=button name=transdateto name=transdateto id="trigger4" value=|
-      . $locale->text('button') . qq|></td>
-     |;
-
-    #write Trigger
-    $jsscript =
-      Form->write_trigger(\%myconfig, "2", "transdatefrom", "BR", "trigger3",
-                          "transdateto", "BL", "trigger4");
-  } else {
 
-    # without JavaScript Calendar
-    $button1 = qq|
-                              <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}"></td>|;
-    $button2 = qq|
-                              <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}"></td>|;
+  $button1 = qq|
+     <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">
+     <input type=button name=transdatefrom id="trigger3" value=|
+    . $locale->text('button') . qq|></td>
+    |;
+  $button2 = qq|
+     <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">
+     <input type=button name=transdateto name=transdateto id="trigger4" value=|
+    . $locale->text('button') . qq|></td>
+   |;
+
+  #write Trigger
+  $jsscript =
+    Form->write_trigger(\%myconfig, "2", "transdatefrom", "BR", "trigger3",
+                        "transdateto", "BL", "trigger4");
+
+  my $vc = $form->{vc} eq "customer" ? "customers" : "vendors";
+
+  $form->get_lists("projects"  => { "key" => "ALL_PROJECTS",
+                                    "all" => 1 },
+                   "employees" => "ALL_EMPLOYEES",
+                   "salesmen"  => "ALL_SALESMEN",
+                   $vc         => "ALL_" . uc($vc)
+                  );
+
+  my %labels = ();
+  my @values = ("");
+  foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
+    push(@values, $item->{"id"});
+    $labels{$item->{"id"}} = $item->{"projectnumber"};
+  }
+  my $projectnumber =
+    NTI($cgi->popup_menu('-name' => 'project_id', '-values' => \@values,
+                         '-labels' => \%labels));
+
+  #employees
+  %labels = ();
+  @values = ("");
+  foreach my $item (@{ $form->{"ALL_EMPLOYEES"} }) {
+    push(@values, $item->{"id"});
+    $labels{$item->{"id"}} = $item->{"name"} ne "" ? $item->{"name"} : $item->{"login"};
+  }
+  
+  #salesmen
+  my %labels_salesmen = ();
+  my @values_salesmen = ('');
+  foreach my $item (@{ $form->{"ALL_SALESMEN"} }) {
+    push(@values_salesmen, $item->{"id"});
+    $labels_salesmen{$item->{"id"}} = $item->{"name"} ne "" ? $item->{"name"} : $item->{"login"};
+  }
+
+  my $employee_block = qq|
+    <tr>
+      <th align="right">| . $locale->text('Employee') . qq|</th>
+      <td>| .  NTI($cgi->popup_menu('-name'   => 'employee_id', '-values' => \@values, '-labels' => \%labels)) . qq|</td>
+    </tr>
+    <tr>
+      <th align="right">| . $locale->text('Salesman') . qq|</th>
+      <td>| .
+        NTI($cgi->popup_menu('-name'   => 'salesman_id',
+                             '-values' => \@values_salesmen,
+                             '-labels' => \%labels_salesmen)) . qq|
+      </td>
+    </tr>|;
+
+  %labels = ();
+  @values = ("");
+
+  foreach my $item (@{ $form->{($form->{vc} eq "customer" ? "ALL_CUSTOMERS" : "ALL_VENDORS")}}) {
+    push(@values, $item->{name}.qq|--|.$item->{"id"});
+    $labels{$item->{name}.qq|--|.$item->{"id"}} = $item->{"name"};
   }
 
+  my $vc_label = $form->{vc} eq "customer" ? $locale->text('Customer') : $locale->text('Vendor');
+  $vc =
+    $myconfig{vclimit} <=  scalar(@values)
+    ? qq|<input type="text" value="| . H(($form->{"old$form->{vc}"} =~ /^(.*)\-\-.*$/)) . qq|" name="$form->{vc}">| 
+    : NTI($cgi->popup_menu('-name' => "$form->{vc}",
+                           '-default' => $form->{"old$form->{vc}"},
+                           '-onChange' => 'document.getElementById(\'update_button\').click();',
+                           '-values' => \@values,
+                           '-labels' => \%labels));
   $form->header;
 
   print qq|
@@ -1447,54 +838,65 @@ sub search {
     <td>
       <table>
         <tr>
-          <th align=right>$vclabel</th>
+          <th align=right>$vc_label</th>
           <td colspan=3>$vc</td>
         </tr>
-	$warehouse
-	$department
+$department
         <tr>
           <th align=right>$ordlabel</th>
           <td colspan=3><input name="$ordnumber" size=20></td>
         </tr>
+$employee_block
+        <tr>
+          <th align="right">| . $locale->text('Transaction description') . qq|</th>
+          <td colspan="3"><input name="transaction_description" size=20></td>
+        </tr>
         <tr>
-          <th align=right>| . $locale->text('From') . qq|</th>
-          $button1
-          <th align=right>| . $locale->text('Bis') . qq|</th>
-          $button2
+          <th align="right">| . $locale->text("Project Number") . qq|</th>
+          <td colspan="3">$projectnumber</td>
+        </tr>
+        <tr>
+          <th align=right>| . $locale->text('From') . qq|</th> $button1
+          <th align=right>| . $locale->text('Bis') . qq|</th> $button2
         </tr>
         <input type=hidden name=sort value=transdate>
         <tr>
           <th align=right>| . $locale->text('Include in Report') . qq|</th>
           <td colspan=5>
 	    <table>
-	      $openclosed
+        <tr>
+          <td><input type="checkbox" name="open" value="1" id="open" checked> <label for="open">| . $locale->text("Open") . qq|</td>
+          <td><input type="checkbox" name="closed" value="1" id="closed"> <label for="closed">| . $locale->text("Closed") . qq|</td>
+        </tr>
         $delivered
 	      <tr>
-		<td><input name="l_id" class=checkbox type=checkbox value=Y>
-		| . $locale->text('ID') . qq|</td>
+		<td><input name="l_id" class=checkbox type=checkbox value=Y> | . $locale->text('ID') . qq|</td>
 		<td><input name="l_$ordnumber" class=checkbox type=checkbox value=Y checked> $ordlabel</td>
-		<td><input name="l_transdate" class=checkbox type=checkbox value=Y checked> |
-    . $locale->text('Date') . qq|</td>
-		<td><input name="l_reqdate" class=checkbox type=checkbox value=Y checked> |
-    . $locale->text('Required by') . qq|</td>
+		<td><input name="l_transdate" class=checkbox type=checkbox value=Y checked> | . $locale->text('Date') . qq|</td>
+		<td><input name="l_reqdate" class=checkbox type=checkbox value=Y checked> | . $locale->text('Required by') . qq|</td>
 	      </tr>
 	      <tr>
-	        <td><input name="l_name" class=checkbox type=checkbox value=Y checked> $vclabel</td>
+	        <td><input name="l_name" class=checkbox type=checkbox value=Y checked> $vc_label</td>
 	        <td><input name="l_employee" class=checkbox type=checkbox value=Y checked> $employee</td>
-		<td><input name="l_shipvia" class=checkbox type=checkbox value=Y> |
-    . $locale->text('Ship via') . qq|</td>
+	        
+		<td><input name="l_shipvia" class=checkbox type=checkbox value=Y> | . $locale->text('Ship via') . qq|</td>
+	      </tr>
+	      <tr>
+		<td><input name="l_netamount" class=checkbox type=checkbox value=Y> | . $locale->text('Amount') . qq|</td>
+		<td><input name="l_tax" class=checkbox type=checkbox value=Y> | . $locale->text('Tax') . qq|</td>
+		<td><input name="l_amount" class=checkbox type=checkbox value=Y checked> | . $locale->text('Total') . qq|</td>
 	      </tr>
 	      <tr>
-		<td><input name="l_netamount" class=checkbox type=checkbox value=Y> |
-    . $locale->text('Amount') . qq|</td>
-		<td><input name="l_tax" class=checkbox type=checkbox value=Y> |
-    . $locale->text('Tax') . qq|</td>
-		<td><input name="l_amount" class=checkbox type=checkbox value=Y checked> |
-    . $locale->text('Total') . qq|</td>
+		<td><input name="l_marge_total" class=checkbox type=checkbox value=Y> | .             $locale->text('Ertrag') . qq|</td>
+		<td><input name="l_marge_percent" class=checkbox type=checkbox value=Y> | .             $locale->text('Ertrag prozentual') . qq|</td>
 	      </tr>
 	      <tr>
-	        <td><input name="l_subtotal" class=checkbox type=checkbox value=Y> |
-    . $locale->text('Subtotal') . qq|</td>
+          <td><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y> | . $locale->text('Project Number') . qq|</td>
+          <td><input name="l_transaction_description" class=checkbox type=checkbox value=Y> | . $locale->text('Transaction description') . qq|</td>
+	      </tr>
+	      <tr>
+	        <td><input name="l_subtotal" class=checkbox type=checkbox value=Y> | . $locale->text('Subtotal') . qq|</td>
+                <td><input name="l_salesman" class="checkbox" type="checkbox" value="Y"> | . $locale->text('Salesman') . qq|</td>
 	      </tr>
 	    </table>
           </td>
@@ -1509,7 +911,6 @@ $jsscript
 
 <br>
 <input type=hidden name=nextsub value=orders>
-<input type=hidden name=path value=$form->{path}>
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 <input type=hidden name=vc value=$form->{vc}>
@@ -1526,389 +927,266 @@ $jsscript
   $lxdebug->leave_sub();
 }
 
-sub orders {
+sub create_subtotal_row {
   $lxdebug->enter_sub();
 
-  # split vendor / customer
-  ($form->{ $form->{vc} }, $form->{"$form->{vc}_id"}) =
-    split(/--/, $form->{ $form->{vc} });
+  my ($totals, $columns, $column_alignment, $subtotal_columns, $class) = @_;
 
-  OE->transactions(\%myconfig, \%$form);
+  my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => $column_alignment->{$_}, } } @{ $columns } };
 
-  $ordnumber = ($form->{type} =~ /_order$/) ? "ordnumber" : "quonumber";
+  map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $totals->{$_}, 2) } @{ $subtotal_columns };
 
-  $number     = $form->escape($form->{$ordnumber});
-  $name       = $form->escape($form->{ $form->{vc} });
-  $department = $form->escape($form->{department});
-  $warehouse  = $form->escape($form->{warehouse});
+  $row->{tax}->{data} = $form->format_amount(\%myconfig, $totals->{amount} - $totals->{netamount}, 2);
 
-  # construct href
-  $href =
-    "$form->{script}?path=$form->{path}&action=orders&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&transdatefrom=$form->{transdatefrom}&transdateto=$form->{transdateto}&open=$form->{open}&closed=$form->{closed}&notdelivered=$form->{notdelivered}&delivered=$form->{delivered}&$ordnumber=$number&$form->{vc}=$name&department=$department&warehouse=$warehouse";
+  map { $totals->{$_} = 0 } @{ $subtotal_columns };
 
-  # construct callback
-  $number     = $form->escape($form->{$ordnumber},    1);
-  $name       = $form->escape($form->{ $form->{vc} }, 1);
-  $department = $form->escape($form->{department},    1);
-  $warehouse  = $form->escape($form->{warehouse},     1);
+  $lxdebug->leave_sub();
 
-  $callback =
-    "$form->{script}?path=$form->{path}&action=orders&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&transdatefrom=$form->{transdatefrom}&transdateto=$form->{transdateto}&open=$form->{open}&closed=$form->{closed}&notdelivered=$form->{notdelivered}&delivered=$form->{delivered}&$ordnumber=$number&$form->{vc}=$name&department=$department&warehouse=$warehouse";
+  return $row;
+}
 
-  @columns =
-    $form->sort_columns("transdate", "reqdate",   "id",      "$ordnumber",
-                        "name",      "netamount", "tax",     "amount",
-                        "curr",      "employee",  "shipvia", "open",
-                        "closed",    "delivered");
+sub orders {
+  $lxdebug->enter_sub();
 
-  $form->{l_open} = $form->{l_closed} = "Y"
-    if ($form->{open} && $form->{closed});
+  $ordnumber = ($form->{type} =~ /_order$/) ? "ordnumber" : "quonumber";
 
-  $form->{"l_delivered"} = "Y"
-    if ($form->{"delivered"} && $form->{"notdelivered"});
+  ($form->{ $form->{vc} }, $form->{"${form->{vc}}_id"}) = split(/--/, $form->{ $form->{vc} });
 
-  foreach $item (@columns) {
-    if ($form->{"l_$item"} eq "Y") {
-      push @column_index, $item;
+  $form->{sort} ||= 'transdate';
 
-      # add column to href and callback
-      $callback .= "&l_$item=Y";
-      $href     .= "&l_$item=Y";
-    }
-  }
+  OE->transactions(\%myconfig, \%$form);
+
+  $form->{rowcount} = scalar @{ $form->{OE} };
+
+  my @columns = (
+    "transdate",               "reqdate",
+    "id",                      $ordnumber,
+    "name",                    "netamount",
+    "tax",                     "amount",
+    "curr",                    "employee",
+    "salesman",
+    "shipvia",                 "globalprojectnumber",
+    "transaction_description", "open",
+    "delivered", "marge_total", "marge_percent"
+  );
 
   # only show checkboxes if gotten here via sales_order form.
-  if ($form->{type} =~ /sales_order/) {
-    unshift @column_index, "ids";
+  my $allow_multiple_orders = $form->{type} eq 'sales_order';
+  if ($allow_multiple_orders) {
+    unshift @columns, "ids";
   }
 
-  if ($form->{l_subtotal} eq 'Y') {
-    $callback .= "&l_subtotal=Y";
-    $href     .= "&l_subtotal=Y";
-  }
+  $form->{l_open}      = $form->{l_closed} = "Y" if ($form->{open}      && $form->{closed});
+  $form->{l_delivered} = "Y"                     if ($form->{delivered} && $form->{notdelivered});
 
+  my $attachment_basename;
   if ($form->{vc} eq 'vendor') {
-    if ($form->{type} eq 'receive_order') {
-      $form->{title} = $locale->text('Receive Merchandise');
-    } elsif ($form->{type} eq 'purchase_order') {
-      $form->{title} = $locale->text('Purchase Orders');
+    if ($form->{type} eq 'purchase_order') {
+      $form->{title}       = $locale->text('Purchase Orders');
+      $attachment_basename = $locale->text('purchase_order_list');
     } else {
-      $form->{title} = $locale->text('Request for Quotations');
+      $form->{title}       = $locale->text('Request for Quotations');
+      $attachment_basename = $locale->text('rfq_list');
     }
-    $name     = $locale->text('Vendor');
-    $employee = $locale->text('Employee');
-  }
-  if ($form->{vc} eq 'customer') {
+
+  } else {
     if ($form->{type} eq 'sales_order') {
-      $form->{title} = $locale->text('Sales Orders');
-      $employee = $locale->text('Salesperson');
-    } elsif ($form->{type} eq 'ship_order') {
-      $form->{title} = $locale->text('Ship Merchandise');
-      $employee = $locale->text('Salesperson');
+      $form->{title}       = $locale->text('Sales Orders');
+      $attachment_basename = $locale->text('sales_order_list');
     } else {
-      $form->{title} = $locale->text('Quotations');
-      $employee = $locale->text('Employee');
+      $form->{title}       = $locale->text('Quotations');
+      $attachment_basename = $locale->text('quotation_list');
     }
-    $name = $locale->text('Customer');
-  }
-
-  $column_header{id} =
-      qq|<th><a class=listheading href=$href&sort=id>|
-    . $locale->text('ID')
-    . qq|</a></th>|;
-  $column_header{transdate} =
-      qq|<th><a class=listheading href=$href&sort=transdate>|
-    . $locale->text('Date')
-    . qq|</a></th>|;
-  $column_header{reqdate} =
-      qq|<th><a class=listheading href=$href&sort=reqdate>|
-    . $locale->text('Required by')
-    . qq|</a></th>|;
-  $column_header{ordnumber} =
-      qq|<th><a class=listheading href=$href&sort=ordnumber>|
-    . $locale->text('Order')
-    . qq|</a></th>|;
-  $column_header{quonumber} =
-      qq|<th><a class=listheading href=$href&sort=quonumber>|
-    . ($form->{"type"} eq "request_quotation" ?
-       $locale->text('RFQ') :
-       $locale->text('Quotation'))
-    . qq|</a></th>|;
-  $column_header{name} =
-    qq|<th><a class=listheading href=$href&sort=name>$name</a></th>|;
-  $column_header{netamount} =
-    qq|<th class=listheading>| . $locale->text('Amount') . qq|</th>|;
-  $column_header{tax} =
-    qq|<th class=listheading>| . $locale->text('Tax') . qq|</th>|;
-  $column_header{amount} =
-    qq|<th class=listheading>| . $locale->text('Total') . qq|</th>|;
-  $column_header{curr} =
-    qq|<th class=listheading>| . $locale->text('Curr') . qq|</th>|;
-  $column_header{shipvia} =
-      qq|<th><a class=listheading href=$href&sort=shipvia>|
-    . $locale->text('Ship via')
-    . qq|</a></th>|;
-  $column_header{open} =
-    qq|<th class=listheading>| . $locale->text('O') . qq|</th>|;
-  $column_header{closed} =
-    qq|<th class=listheading>| . $locale->text('C') . qq|</th>|;
-  $column_header{"delivered"} =
-    qq|<th class="listheading">| . $locale->text("Delivered") . qq|</th>|;
-
-  $column_header{employee} =
-    qq|<th><a class=listheading href=$href&sort=employee>$employee</a></th>|;
-
-  $column_header{ids} = qq|<th></th>|;
-
-  if ($form->{ $form->{vc} }) {
-    $option = $locale->text(ucfirst $form->{vc});
-    $option .= " : $form->{$form->{vc}}";
-  }
-  if ($form->{warehouse}) {
-    ($warehouse) = split /--/, $form->{warehouse};
-    $option .= "\n<br>" if ($option);
-    $option .= $locale->text('Warehouse');
-    $option .= " : $warehouse";
-  }
-  if ($form->{department}) {
-    $option .= "\n<br>" if ($option);
-    ($department) = split /--/, $form->{department};
-    $option .= $locale->text('Department') . " : $department";
-  }
-  if ($form->{transdatefrom}) {
-    $option .= "\n<br>"
-      . $locale->text('From') . " "
-      . $locale->date(\%myconfig, $form->{transdatefrom}, 1);
-  }
-  if ($form->{transdateto}) {
-    $option .= "\n<br>"
-      . $locale->text('Bis') . " "
-      . $locale->date(\%myconfig, $form->{transdateto}, 1);
-  }
-  if ($form->{open}) {
-    $option .= "\n<br>" if ($option);
-    $option .= $locale->text('Open');
-  }
-  if ($form->{closed}) {
-    $option .= "\n<br>" if ($option);
-    $option .= $locale->text('Closed');
   }
 
-  $form->header;
+  my $report = SL::ReportGenerator->new(\%myconfig, $form);
+
+  my @hidden_variables = map { "l_${_}" } @columns;
+  push @hidden_variables, "l_subtotal", $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered ordnumber quonumber
+                                                        transaction_description transdatefrom transdateto type vc employee_id salesman_id);
+
+  my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables);
+
+  my %column_defs = (
+    'ids'                     => { 'text' => '', },
+    'transdate'               => { 'text' => $locale->text('Date'), },
+    'reqdate'                 => { 'text' => $locale->text('Required by'), },
+    'id'                      => { 'text' => $locale->text('ID'), },
+    'ordnumber'               => { 'text' => $locale->text('Order'), },
+    'quonumber'               => { 'text' => $form->{type} eq "request_quotation" ? $locale->text('RFQ') : $locale->text('Quotation'), },
+    'name'                    => { 'text' => $form->{vc} eq 'customer' ? $locale->text('Customer') : $locale->text('Vendor'), },
+    'netamount'               => { 'text' => $locale->text('Amount'), },
+    'tax'                     => { 'text' => $locale->text('Tax'), },
+    'amount'                  => { 'text' => $locale->text('Total'), },
+    'curr'                    => { 'text' => $locale->text('Curr'), },
+    'employee'                => { 'text' => $locale->text('Employee'), },
+    'salesman'                => { 'text' => $locale->text('Salesman'), },
+    'shipvia'                 => { 'text' => $locale->text('Ship via'), },
+    'globalprojectnumber'     => { 'text' => $locale->text('Project Number'), },
+    'transaction_description' => { 'text' => $locale->text('Transaction description'), },
+    'open'                    => { 'text' => $locale->text('Open'), },
+    'delivered'               => { 'text' => $locale->text('Delivered'), },
+    'marge_total'                   => { 'text' => $locale->text('Ertrag'), },
+    'marge_percent'           => { 'text' => $locale->text('Ertrag prozentual'), }
+  );
 
-  print qq|
-<body>
+  foreach my $name (qw(id transdate reqdate quonumber ordnumber name employee salesman shipvia)) {
+    $column_defs{$name}->{link} = $href . "&sort=$name";
+  }
 
-<form method="post" action="oe.pl">
-<table width=100%>
-  <tr>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>$option</td>
-  </tr>
-  <tr>
-    <td>
-      <table width=100%>
-	<tr class=listheading>|;
+  my %column_alignment = map { $_ => 'right' } qw(netamount tax amount curr);
 
-  map { print "\n$column_header{$_}" } @column_index;
+  $form->{"l_type"} = "Y";
+  map { $column_defs{$_}->{visible} = $form->{"l_${_}"} ? 1 : 0 } @columns;
+  $column_defs{ids}->{visible} = $allow_multiple_orders ? 'HTML' : 0;
 
-  print qq|
-	</tr>
-|;
+  $report->set_columns(%column_defs);
+  $report->set_column_order(@columns);
 
-  # add sort and escape callback
-  $callback_escaped = $form->escape($callback . "&sort=$form->{sort}");
+  $report->set_export_options('orders', @hidden_variables);
 
-  if (@{ $form->{OE} }) {
-    $sameitem = $form->{OE}->[0]->{ $form->{sort} };
+  $report->set_sort_indicator($form->{sort}, 1);
+
+  my @options;
+  if ($form->{customer}) {
+    push @options, $locale->text('Customer') . " : $form->{customer}";
+  }
+  if ($form->{vendor}) {
+    push @options, $locale->text('Vendor') . " : $form->{vendor}";
+  }
+  if ($form->{department}) {
+    ($department) = split /--/, $form->{department};
+    push @options, $locale->text('Department') . " : $department";
+  }
+  if ($form->{ordnumber}) {
+    push @options, $locale->text('Order Number') . " : $form->{ordnumber}";
+  }
+  if ($form->{notes}) {
+    push @options, $locale->text('Notes') . " : $form->{notes}";
+  }
+  if ($form->{transaction_description}) {
+    push @options, $locale->text('Transaction description') . " : $form->{transaction_description}";
+  }
+  if ($form->{transdatefrom}) {
+    push @options, $locale->text('From') . "&nbsp;" . $locale->date(\%myconfig, $form->{transdatefrom}, 1);
+  }
+  if ($form->{transdateto}) {
+    push @options, $locale->text('Bis') . "&nbsp;" . $locale->date(\%myconfig, $form->{transdateto}, 1);
+  }
+  if ($form->{open}) {
+    push @options, $locale->text('Open');
+  }
+  if ($form->{closed}) {
+    push @options, $locale->text('Closed');
+  }
+  if ($form->{delivered}) {
+    push @options, $locale->text('Delivered');
+  }
+  if ($form->{notdelivered}) {
+    push @options, $locale->text('Not delivered');
   }
 
-  $action = "edit";
-  $action = "ship_receive" if ($form->{type} =~ /(ship|receive)_order/);
-
-  $warehouse = $form->escape($form->{warehouse});
-
-  foreach $oe (@{ $form->{OE} }) {
-    $form->{rowcount} = ++$j;
-
-    if ($form->{l_subtotal} eq 'Y') {
-      if ($sameitem ne $oe->{ $form->{sort} }) {
-        &subtotal;
-        $sameitem = $oe->{ $form->{sort} };
-      }
-    }
+  $report->set_options('top_info_text'        => join("\n", @options),
+                       'raw_top_info_text'    => $form->parse_html_template2('oe/orders_top'),
+                       'raw_bottom_info_text' => $form->parse_html_template2('oe/orders_bottom', { 'SHOW_CONTINUE_BUTTON' => $allow_multiple_orders }),
+                       'output_format'        => 'HTML',
+                       'title'                => $form->{title},
+                       'attachment_basename'  => $attachment_basename . strftime('_%Y%m%d', localtime time),
+    );
+  $report->set_options_from_form();
 
-    map { $oe->{$_} *= $oe->{exchangerate} } (qw(netamount amount));
-
-    $column_data{netamount} =
-        "<td align=right>"
-      . $form->format_amount(\%myconfig, $oe->{netamount}, 2, "&nbsp;")
-      . "</td>";
-    $column_data{tax} = "<td align=right>"
-      . $form->format_amount(\%myconfig, $oe->{amount} - $oe->{netamount},
-                             2, "&nbsp;")
-      . "</td>";
-    $column_data{amount} =
-      "<td align=right>"
-      . $form->format_amount(\%myconfig, $oe->{amount}, 2, "&nbsp;") . "</td>";
-
-    $totalnetamount += $oe->{netamount};
-    $totalamount    += $oe->{amount};
-
-    $subtotalnetamount += $oe->{netamount};
-    $subtotalamount    += $oe->{amount};
-
-    $column_data{ids} =
-      qq|<td><input name="id_$j" class=checkbox type=checkbox><input type="hidden" name="trans_id_$j" value="$oe->{id}"></td>|;
-    $column_data{id}        = "<td>$oe->{id}</td>";
-    $column_data{transdate} = "<td>$oe->{transdate}&nbsp;</td>";
-    $column_data{reqdate}   = "<td>$oe->{reqdate}&nbsp;</td>";
-
-    $column_data{$ordnumber} =
-      "<td><a href=oe.pl?path=$form->{path}&action=$action&type=$form->{type}&id=$oe->{id}&warehouse=$warehouse&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&callback=$callback_escaped>$oe->{$ordnumber}</a></td>";
-    $column_data{name} = "<td>$oe->{name}</td>";
-
-    $column_data{employee} = "<td>$oe->{employee}&nbsp;</td>";
-    $column_data{shipvia}  = "<td>$oe->{shipvia}&nbsp;</td>";
-
-    if ($oe->{closed}) {
-      $column_data{closed} = "<td align=center>X</td>";
-      $column_data{open}   = "<td>&nbsp;</td>";
-    } else {
-      $column_data{closed} = "<td>&nbsp;</td>";
-      $column_data{open}   = "<td align=center>X</td>";
-    }
-    $column_data{"delivered"} = "<td>" .
-      ($oe->{"delivered"} ? $locale->text("Yes") : $locale->text("No")) .
-      "</td>";
+  # add sort and escape callback, this one we use for the add sub
+  $form->{callback} = $href .= "&sort=$form->{sort}";
 
-    $i++;
-    $i %= 2;
-    print "
-        <tr class=listrow$i>";
+  # escape callback for href
+  $callback = $form->escape($href);
 
-    map { print "\n$column_data{$_}" } @column_index;
+  my @subtotal_columns = qw(netamount amount marge_total marge_percent);
 
-    print qq|
-	</tr>
-|;
+  my %totals    = map { $_ => 0 } @subtotal_columns;
+  my %subtotals = map { $_ => 0 } @subtotal_columns;
 
-  }
+  my $idx = 0;
 
-  if ($form->{l_subtotal} eq 'Y') {
-    &subtotal;
-  }
+  my $edit_url = build_std_url('action=edit', 'type', 'vc');
 
-  # print totals
-  print qq|
-        <tr class=listtotal>|;
+  foreach $oe (@{ $form->{OE} }) {
+    map { $oe->{$_} *= $oe->{exchangerate} } @subtotal_columns;
 
-  map { $column_data{$_} = "<td>&nbsp;</td>" } @column_index;
+    $oe->{tax}       = $oe->{amount} - $oe->{netamount};
+    $oe->{open}      = $oe->{closed}    ? $locale->text('No')  : $locale->text('Yes');
+    $oe->{delivered} = $oe->{delivered} ? $locale->text('Yes') : $locale->text('No');
 
-  $column_data{netamount} =
-    "<th class=listtotal align=right>"
-    . $form->format_amount(\%myconfig, $totalnetamount, 2, "&nbsp;") . "</th>";
-  $column_data{tax} = "<th class=listtotal align=right>"
-    . $form->format_amount(\%myconfig, $totalamount - $totalnetamount,
-                           2, "&nbsp;")
-    . "</th>";
-  $column_data{amount} =
-    "<th class=listtotal align=right>"
-    . $form->format_amount(\%myconfig, $totalamount, 2, "&nbsp;") . "</th>";
+    map { $subtotals{$_} += $oe->{$_};
+          $totals{$_}    += $oe->{$_} } @subtotal_columns;
 
-  map { print "\n$column_data{$_}" } @column_index;
+    $subtotals{marge_percent} = $subtotals{netamount} ? ($subtotals{marge_total} * 100 / $subtotals{netamount}) : 0;
+    $totals{marge_percent}    = $totals{netamount}    ? ($totals{marge_total}    * 100 / $totals{netamount}   ) : 0;
 
-  print qq|
-        </tr>
-      </td>
-    </table>
-  </tr>
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-</table>|;
+    map { $oe->{$_} = $form->format_amount(\%myconfig, $oe->{$_}, 2) } qw(netamount tax amount marge_total marge_percent);
 
-  # multiple invoice edit button only if gotten there via sales_order form.
+    my $row = { };
 
-  if ($form->{type} =~ /sales_order/) {
-    print qq|
-  <input type="hidden" name="path" value="$form->{path}">
-  <input class"submit" type="submit" name="action" value="|
-      . $locale->text('Continue') . qq|">
-  <input type="hidden" name="nextsub" value="edit">
-  <input type="hidden" name="type" value="$form->{type}">
-  <input type="hidden" name="warehouse" value="$warehouse">
-  <input type="hidden" name="vc" value="$form->{vc}">
-  <input type="hidden" name="login" value="$form->{login}">
-  <input type="hidden" name="password" value="$form->{password}">
-  <input type="hidden" name="callback" value="$callback">
-  <input type="hidden" name="rowcount" value="$form->{rowcount}">|;
-  }
+    foreach my $column (@columns) {
+      next if ($column eq 'ids');
+      $row->{$column} = {
+        'data'  => $oe->{$column},
+        'align' => $column_alignment{$column},
+      };
+    }
 
-  print qq|
-</form>
+    $row->{ids} = {
+      'raw_data' =>   $cgi->hidden('-name' => "trans_id_${idx}", '-value' => $oe->{id})
+                    . $cgi->checkbox('-name' => "multi_id_${idx}", '-value' => 1, '-label' => ''),
+      'valign'   => 'center',
+      'align'    => 'center',
+    };
 
-<br>
-<form method=post action=$form->{script}>
+    $row->{$ordnumber}->{link} = $edit_url . "&id=" . E($oe->{id}) . "&callback=${callback}";
 
-<input name=callback type=hidden value="$form->{callback}">
+    my $row_set = [ $row ];
 
-<input type=hidden name=type value=$form->{type}>
-<input type=hidden name=vc value=$form->{vc}>
+    if (($form->{l_subtotal} eq 'Y')
+        && (($idx == (scalar @{ $form->{OE} } - 1))
+            || ($oe->{ $form->{sort} } ne $form->{OE}->[$idx + 1]->{ $form->{sort} }))) {
+      push @{ $row_set }, create_subtotal_row(\%subtotals, \@columns, \%column_alignment, \@subtotal_columns, 'listsubtotal');
+    }
 
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-|;
+    $report->add_data($row_set);
 
-  if ($form->{type} !~ /(ship|receive)_order/) {
-    print qq|
-<input class=submit type=submit name=action value="|
-      . $locale->text('Add') . qq|">|;
+    $idx++;
   }
 
-  print qq|
-</form>
+  $report->add_separator();
+  $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal'));
 
-</body>
-</html>
-|;
+  $report->generate_with_headers();
 
   $lxdebug->leave_sub();
 }
 
-sub subtotal {
+sub check_delivered_flag {
   $lxdebug->enter_sub();
 
-  map { $column_data{$_} = "<td>&nbsp;</td>" } @column_index;
+  if (($form->{type} ne 'sales_order') && ($form->{type} ne 'purchase_order')) {
+    return $lxdebug->leave_sub();
+  }
 
-  $column_data{netamount} =
-      "<th class=listsubtotal align=right>"
-    . $form->format_amount(\%myconfig, $subtotalnetamount, 2, "&nbsp;")
-    . "</th>";
-  $column_data{tax} = "<td class=listsubtotal align=right>"
-    . $form->format_amount(\%myconfig, $subtotalamount - $subtotalnetamount,
-                           2, "&nbsp;")
-    . "</th>";
-  $column_data{amount} =
-    "<th class=listsubtotal align=right>"
-    . $form->format_amount(\%myconfig, $subtotalamount, 2, "&nbsp;") . "</th>";
+  my $all_delivered = 0;
 
-  $subtotalnetamount = 0;
-  $subtotalamount    = 0;
+  foreach my $i (1 .. $form->{rowcount}) {
+    next if (!$form->{"id_$i"});
 
-  print "
-        <tr class=listsubtotal>
-";
+    if ($form->parse_amount(\%myconfig, $form->{"qty_$i"}) == $form->parse_amount(\%myconfig, $form->{"ship_$i"})) {
+      $all_delivered = 1;
+      next;
+    }
 
-  map { print "\n$column_data{$_}" } @column_index;
+    $all_delivered = 0;
+    last;
+  }
 
-  print qq|
-        </tr>
-|;
+  $form->{delivered} = 1 if $all_delivered;
 
   $lxdebug->leave_sub();
 }
@@ -1916,12 +1194,18 @@ sub subtotal {
 sub save_and_close {
   $lxdebug->enter_sub();
 
+  $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
+
   if ($form->{type} =~ /_order$/) {
     $form->isblank("transdate", $locale->text('Order Date missing!'));
   } else {
     $form->isblank("transdate", $locale->text('Quotation Date missing!'));
   }
 
+  my $idx = $form->{type} =~ /_quotation$/ ? "quonumber" : "ordnumber";
+  $form->{$idx} =~ s/^\s*//g;
+  $form->{$idx} =~ s/\s*$//g;
+
   $msg = ucfirst $form->{vc};
   $form->isblank($form->{vc}, $locale->text($msg . " missing!"));
 
@@ -1932,9 +1216,16 @@ sub save_and_close {
     if ($form->{currency} ne $form->{defaultcurrency});
 
   &validate_items;
-
+  
+  if($form->{payment_id}) { 
+    $payment_id = $form->{payment_id};
+  }
+  
   # if the name changed get new values
   if (&check_name($form->{vc})) {
+    if($form->{payment_id} eq "") { 
+      $form->{payment_id} = $payment_id;
+    }
     &update;
     exit;
   }
@@ -1957,6 +1248,8 @@ sub save_and_close {
 
     $err = $locale->text('Cannot save order!');
 
+    check_delivered_flag();
+
   } else {
     if ($form->{type} eq 'sales_quotation') {
       $form->{label} = $locale->text('Quotation');
@@ -1981,10 +1274,18 @@ sub save_and_close {
 
   relink_accounts();
 
-  $form->redirect(
-            $form->{label} . " $form->{$ordnumber} " . $locale->text('saved!'))
-    if (OE->save(\%myconfig, \%$form));
-  $form->error($err);
+  $form->error($err) if (!OE->save(\%myconfig, \%$form));
+
+  # saving the history
+  if(!exists $form->{addition}) {
+    $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
+  	$form->{addition} = "SAVED";
+  	$form->save_history($form->dbconnect(\%myconfig));
+  }
+  # /saving the history
+
+  $form->redirect($form->{label} . " $form->{$ordnumber} " .
+                  $locale->text('saved!'));
 
   $lxdebug->leave_sub();
 }
@@ -1992,12 +1293,19 @@ sub save_and_close {
 sub save {
   $lxdebug->enter_sub();
 
+  $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
+
+
   if ($form->{type} =~ /_order$/) {
     $form->isblank("transdate", $locale->text('Order Date missing!'));
   } else {
     $form->isblank("transdate", $locale->text('Quotation Date missing!'));
   }
 
+  my $idx = $form->{type} =~ /_quotation$/ ? "quonumber" : "ordnumber";
+  $form->{$idx} =~ s/^\s*//g;
+  $form->{$idx} =~ s/\s*$//g;
+
   $msg = ucfirst $form->{vc};
   $form->isblank($form->{vc}, $locale->text($msg . " missing!"));
 
@@ -2008,9 +1316,16 @@ sub save {
     if ($form->{currency} ne $form->{defaultcurrency});
 
   &validate_items;
-
+  
+  if($form->{payment_id}) { 
+    $payment_id = $form->{payment_id};
+  }
+  
   # if the name changed get new values
   if (&check_name($form->{vc})) {
+    if($form->{payment_id} eq "") { 
+      $form->{payment_id} = $payment_id;
+    }
     &update;
     exit;
   }
@@ -2033,6 +1348,8 @@ sub save {
 
     $err = $locale->text('Cannot save order!');
 
+    check_delivered_flag();
+
   } else {
     if ($form->{type} eq 'sales_quotation') {
       $form->{label} = $locale->text('Quotation');
@@ -2056,6 +1373,15 @@ sub save {
   relink_accounts();
 
   OE->save(\%myconfig, \%$form);
+
+  # saving the history
+  if(!exists $form->{addition}) {
+    $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
+  	$form->{addition} = "SAVED";
+  	$form->save_history($form->dbconnect(\%myconfig));
+  }
+  # /saving the history 
+
   $form->{simple_save} = 1;
   if(!$form->{print_and_save}) {
     set_headings("edit");
@@ -2097,8 +1423,11 @@ sub delete {
 
 <h4>$msg $form->{$ordnumber}</h4>
 <p>
+<input type="hidden" name="yes_nextsub" value="delete_order_quotation">
 <input name=action class=submit type=submit value="|
     . $locale->text('Yes') . qq|">
+<button class=submit type=button onclick="history.back()">|
+    . $locale->text('No') . qq|</button>
 </form>
 
 </body>
@@ -2108,7 +1437,7 @@ sub delete {
   $lxdebug->leave_sub();
 }
 
-sub yes {
+sub delete_order_quotation {
   $lxdebug->enter_sub();
 
   if ($form->{type} =~ /_order$/) {
@@ -2118,8 +1447,17 @@ sub yes {
     $msg = $locale->text('Quotation deleted!');
     $err = $locale->text('Cannot delete quotation!');
   }
-
-  $form->redirect($msg) if (OE->delete(\%myconfig, \%$form, $spool));
+  if (OE->delete(\%myconfig, \%$form, $spool)){
+    # saving the history
+    if(!exists $form->{addition}) {
+      $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
+  	  $form->{addition} = "DELETED";
+  	  $form->save_history($form->dbconnect(\%myconfig));
+    }
+    # /saving the history 
+    $form->info($msg);
+    exit();
+  }
   $form->error($err);
 
   $lxdebug->leave_sub();
@@ -2128,27 +1466,33 @@ sub yes {
 sub invoice {
   $lxdebug->enter_sub();
 
+  $form->{old_employee_id} = $form->{employee_id};
+  $form->{old_salesman_id} = $form->{salesman_id};
+
   if ($form->{type} =~ /_order$/) {
 
     # these checks only apply if the items don't bring their own ordnumbers/transdates.
     # The if clause ensures that by searching for empty ordnumber_#/transdate_# fields.
     $form->isblank("ordnumber", $locale->text('Order Number missing!'))
-      if (+{ map { $form->{"ordnumber_$_"}, 1 } (1 .. $form->{rowcount} - 1) }
-          ->{''});
+      if (+{ map { $form->{"ordnumber_$_"}, 1 } (1 .. $form->{rowcount} - 1) }->{''});
     $form->isblank("transdate", $locale->text('Order Date missing!'))
-      if (+{ map { $form->{"transdate_$_"}, 1 } (1 .. $form->{rowcount} - 1) }
-          ->{''});
+      if (+{ map { $form->{"transdate_$_"}, 1 } (1 .. $form->{rowcount} - 1) }->{''});
 
     # also copy deliverydate from the order
     $form->{deliverydate} = $form->{reqdate} if $form->{reqdate};
+    $form->{orddate}      = $form->{transdate};
   } else {
     $form->isblank("quonumber", $locale->text('Quotation Number missing!'));
     $form->isblank("transdate", $locale->text('Quotation Date missing!'));
-    $form->{ordnumber} = "";
+    $form->{ordnumber}    = "";
+    $form->{quodate}      = $form->{transdate};
   }
-
+  
+  $payment_id = $form->{payment_id} if $form->{payment_id};
+  
   # if the name changed get new values
   if (&check_name($form->{vc})) {
+    $form->{payment_id} = $payment_id if $form->{payment_id} eq "";
     &update;
     exit;
   }
@@ -2156,10 +1500,9 @@ sub invoice {
   $form->{cp_id} *= 1;
 
   for $i (1 .. $form->{rowcount}) {
-    map({ $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig,
-                                                     $form->{"${_}_${i}"})
-            if ($form->{"${_}_${i}"}) }
-        qw(ship qty sellprice listprice basefactor));
+    for (qw(ship qty sellprice listprice basefactor)) {
+      $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if $form->{"${_}_${i}"};
+    }
   }
 
   if (   $form->{type} =~ /_order/
@@ -2169,9 +1512,7 @@ sub invoice {
     $buysell = ($form->{type} eq 'sales_order') ? "buy" : "sell";
 
     $orddate      = $form->current_date(\%myconfig);
-    $exchangerate =
-      $form->check_exchangerate(\%myconfig, $form->{currency}, $orddate,
-                                $buysell);
+    $exchangerate = $form->check_exchangerate(\%myconfig, $form->{currency}, $orddate, $buysell);
 
     if (!$exchangerate) {
       &backorder_exchangerate($orddate, $buysell);
@@ -2186,20 +1527,21 @@ sub invoice {
   # if not it's most likely a collective order, which can't be saved back
   # so they just have to be closed
   if (($form->{ordnumber} ne '') || ($form->{quonumber} ne '')) {
-    OE->close_order(\%myconfig, \%$form);
+    OE->close_order(\%myconfig, \%$form) if ($form->{id});
   } else {
     OE->close_orders(\%myconfig, \%$form);
   }
 
   $form->{transdate} = $form->{invdate} = $form->current_date(\%myconfig);
-  $form->{duedate} =
-    $form->current_date(\%myconfig, $form->{invdate}, $form->{terms} * 1);
+  $form->{duedate}   = $form->current_date(\%myconfig, $form->{invdate}, $form->{terms} * 1);
 
   $form->{id}     = '';
   $form->{closed} = 0;
   $form->{rowcount}--;
   $form->{shipto} = 1;
 
+  $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
+
   if ($form->{type} =~ /_order$/) {
     $form->{exchangerate} = $exchangerate;
     &create_backorder;
@@ -2212,7 +1554,9 @@ sub invoice {
     $script         = "ir";
     $buysell        = 'sell';
   }
-  if ($form->{type} eq 'sales_order' || $form->{type} eq 'sales_quotation') {
+
+  if (   $form->{type} eq 'sales_order' 
+      || $form->{type} eq 'sales_quotation') {
     $form->{title}  = $locale->text('Add Sales Invoice');
     $form->{script} = 'is.pl';
     $script         = "is";
@@ -2220,15 +1564,14 @@ sub invoice {
   }
 
   # bo creates the id, reset it
-  map { delete $form->{$_} }
-    qw(id subject message cc bcc printed emailed queued);
+  map { delete $form->{$_} } qw(id subject message cc bcc printed emailed queued);
   $form->{ $form->{vc} } =~ s/--.*//g;
   $form->{type} = "invoice";
 
   # locale messages
   $locale = new Locale "$myconfig{countrycode}", "$script";
 
-  require "$form->{path}/$form->{script}";
+  require "bin/mozilla/$form->{script}";
 
   map { $form->{"select$_"} = "" } ($form->{vc}, currency);
 
@@ -2309,7 +1652,6 @@ sub backorder_exchangerate {
 
   print qq|
 
-<input type=hidden name=path value=$form->{path}>
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 
@@ -2416,736 +1758,454 @@ sub create_backorder {
 
   # rebuild rows for invoice
   @a     = ();
-  $count = 0;
-
-  for $i (1 .. $form->{rowcount}) {
-    $form->{"qty_$i"} = $form->{"ship_$i"};
-
-    if ($form->{"qty_$i"}) {
-      push @a, {};
-      $j = $#a;
-      map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds;
-      $count++;
-    }
-  }
-
-  $form->redo_rows(\@flds, \@a, $count, $form->{rowcount});
-  $form->{rowcount} = $count;
-
-  $lxdebug->leave_sub();
-}
-
-sub save_as_new {
-  $lxdebug->enter_sub();
-
-  $form->{saveasnew} = 1;
-  $form->{closed}    = 0;
-  map { delete $form->{$_} } qw(printed emailed queued ordnumber quonumber);
-
-  &save;
-
-  $lxdebug->leave_sub();
-}
-
-sub purchase_order {
-  $lxdebug->enter_sub();
-
-  if (   $form->{type} eq 'sales_quotation'
-      || $form->{type} eq 'request_quotation') {
-    OE->close_order(\%myconfig, \%$form);
-  }
-
-  $form->{cp_id} *= 1;
-
-  $form->{title} = $locale->text('Add Purchase Order');
-  $form->{vc}    = "vendor";
-  $form->{type}  = "purchase_order";
-
-  &poso;
-
-  $lxdebug->leave_sub();
-}
-
-sub sales_order {
-  $lxdebug->enter_sub();
-
-  if (   $form->{type} eq 'sales_quotation'
-      || $form->{type} eq 'request_quotation') {
-    OE->close_order(\%myconfig, $form);
-  }
-
-  $form->{cp_id} *= 1;
-
-  $form->{title} = $locale->text('Add Sales Order');
-  $form->{vc}    = "customer";
-  $form->{type}  = "sales_order";
-
-  &poso;
-
-  $lxdebug->leave_sub();
-}
-
-sub poso {
-  $lxdebug->enter_sub();
-
-  $form->{transdate} = $form->current_date(\%myconfig);
-  delete $form->{duedate};
-
-  $form->{closed} = 0;
-
-  # reset
-  map { delete $form->{$_} }
-    qw(id subject message cc bcc printed emailed queued customer vendor creditlimit creditremaining discount tradediscount oldinvtotal);
-
-  for $i (1 .. $form->{rowcount}) {
-    map({ $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig,
-                                                     $form->{"${_}_${i}"})
-            if ($form->{"${_}_${i}"}) }
-        qw(ship qty sellprice listprice basefactor));
-  }
-
-  &order_links;
-
-  &prepare_order;
-
-  # format amounts
-  for $i (1 .. $form->{rowcount} - 1) {
-    map { $form->{"${_}_$i"} =~ s/\"/&quot;/g }
-      qw(partnumber description unit);
-  }
-
-  map { $form->{$_} = $form->format_amount(\%myconfig, $form->{$_}, 0, "0") }
-    qw(creditlimit creditremaining);
-
-  &update;
-
-  $lxdebug->leave_sub();
-}
-
-sub ship_receive {
-  $lxdebug->enter_sub();
-
-  &order_links;
-
-  &prepare_order;
-
-  OE->get_warehouses(\%myconfig, \%$form);
-
-  # warehouse
-  if (@{ $form->{all_warehouses} }) {
-    $form->{selectwarehouse} = "<option>\n";
-
-    map { $form->{selectwarehouse} .= "<option>$_->{description}--$_->{id}\n" }
-      (@{ $form->{all_warehouses} });
-
-    if ($form->{warehouse}) {
-      $form->{selectwarehouse} = "<option>$form->{warehouse}";
-    }
-  }
-
-  $form->{shippingdate} = $form->current_date(\%myconfig);
-  $form->{"$form->{vc}"} =~ s/--.*//;
-
-  @flds  = ();
-  @a     = ();
-  $count = 0;
-  foreach $key (keys %$form) {
-    if ($key =~ /_1$/) {
-      $key =~ s/_1//;
-      push @flds, $key;
-    }
-  }
-
-  for $i (1 .. $form->{rowcount}) {
-
-    # undo formatting from prepare_order
-    map {
-      $form->{"${_}_$i"} =
-        $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
-    } qw(qty ship);
-    $n = ($form->{"qty_$i"} -= $form->{"ship_$i"});
-    if (abs($n) > 0
-        && ($form->{"inventory_accno_$i"} || $form->{"assembly_$i"})) {
-      $form->{"ship_$i"}         = "";
-      $form->{"serialnumber_$i"} = "";
-
-      push @a, {};
-      $j = $#a;
-
-      map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds;
-      $count++;
-    }
-  }
-
-  $form->redo_rows(\@flds, \@a, $count, $form->{rowcount});
-  $form->{rowcount} = $count;
-
-  &display_ship_receive;
-
-  $lxdebug->leave_sub();
-}
-
-sub display_ship_receive {
-  $lxdebug->enter_sub();
-
-  $vclabel = ucfirst $form->{vc};
-  $vclabel = $locale->text($vclabel);
-
-  $form->{rowcount}++;
-
-  if ($form->{vc} eq 'customer') {
-    $form->{title} = $locale->text('Ship Merchandise');
-    $shipped = $locale->text('Shipping Date');
-  } else {
-    $form->{title} = $locale->text('Receive Merchandise');
-    $shipped = $locale->text('Date Received');
-  }
-
-  # set option selected
-  foreach $item (warehouse, employee) {
-    $form->{"select$item"} =~ s/ selected//;
-    $form->{"select$item"} =~
-      s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
-  }
-
-  $warehouse = qq|
-	      <tr>
-		<th align=right>| . $locale->text('Warehouse') . qq|</th>
-		<td><select name=warehouse>$form->{selectwarehouse}</select></td>
-		<input type=hidden name=selectwarehouse value="$form->{selectwarehouse}">
-	      </tr>
-| if $form->{selectwarehouse};
-
-  $employee = qq|
- 	      <tr>
-	        <th align=right nowrap>| . $locale->text('Contact') . qq|</th>
-		<td><select name=employee>$form->{selectemployee}</select></td>
-		<input type=hidden name=selectemployee value="$form->{selectemployee}">
-	      </tr>
-|;
-
-  $form->header;
-
-  print qq|
-<body>
-
-<form method=post action=$form->{script}>
+  $count = 0;
 
-<input type=hidden name=id value=$form->{id}>
+  for $i (1 .. $form->{rowcount}) {
+    $form->{"qty_$i"} = $form->{"ship_$i"};
 
-<input type=hidden name=display_form value=display_ship_receive>
+    if ($form->{"qty_$i"}) {
+      push @a, {};
+      $j = $#a;
+      map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds;
+      $count++;
+    }
+  }
 
-<input type=hidden name=type value=$form->{type}>
-<input type=hidden name=media value=$form->{media}>
-<input type=hidden name=format value=$form->{format}>
+  $form->redo_rows(\@flds, \@a, $count, $form->{rowcount});
+  $form->{rowcount} = $count;
 
-<input type=hidden name=queued value="$form->{queued}">
-<input type=hidden name=printed value="$form->{printed}">
-<input type=hidden name=emailed value="$form->{emailed}">
+  $lxdebug->leave_sub();
+}
 
-<input type=hidden name=vc value=$form->{vc}>
+sub save_as_new {
+  $lxdebug->enter_sub();
 
-<table width=100%>
-  <tr class=listtop>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>
-      <table width="100%">
-        <tr valign=top>
-	  <td>
-	    <table width=100%>
-	      <tr>
-		<th align=right>$vclabel</th>
-		<td colspan=3>$form->{$form->{vc}}</td>
-		<input type=hidden name=$form->{vc} value="$form->{$form->{vc}}">
-		<input type=hidden name="$form->{vc}_id" value=$form->{"$form->{vc}_id"}>
-	      </tr>
-	      $department
-	      <tr>
-		<th align=right>| . $locale->text('Shipping Point') . qq|</th>
-		<td colspan=3>
-		<input name=shippingpoint size=35 value="$form->{shippingpoint}">
-	      </tr>
-	      <tr>
-		<th align=right>| . $locale->text('Ship via') . qq|</th>
-		<td colspan=3>
-		<input name=shipvia size=35 value="$form->{shipvia}">
-	      </tr>
-	      $warehouse
-	    </table>
-	  </td>
-	  <td align=right>
-	    <table>
-	      $employee
-	      <tr>
-		<th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
-		<td>$form->{ordnumber}</td>
-		<input type=hidden name=ordnumber value="$form->{ordnumber}">
-	      </tr>
-	      <tr>
-		<th align=right nowrap>| . $locale->text('Order Date') . qq|</th>
-		<td>$form->{transdate}</td>
-		<input type=hidden name=transdate value=$form->{transdate}>
-	      </tr>
-	      <tr>
-		<th align=right nowrap>$shipped</th>
-		<td><input name=shippingdate size=11 value=$form->{shippingdate}></td>
-	      </tr>
-	    </table>
-	  </td>
-	</tr>
-      </table>
-    </td>
-  </tr>
+  $form->{saveasnew} = 1;
+  $form->{closed}    = 0;
+  map { delete $form->{$_} } qw(printed emailed queued);
 
-<!-- shipto are in hidden variables -->
-
-<input type=hidden name=shiptoname value="$form->{shiptoname}">
-<input type=hidden name=shiptostreet value="$form->{shiptostreet}">
-<input type=hidden name=shiptozipcode value="$form->{shiptozipcode}">
-<input type=hidden name=shiptocity value="$form->{shiptocity}">
-<input type=hidden name=shiptocountry value="$form->{shiptocountry}">
-<input type=hidden name=shiptocontact value="$form->{shiptocontact}">
-<input type=hidden name=shiptophone value="$form->{shiptophone}">
-<input type=hidden name=shiptofax value="$form->{shiptofax}">
-<input type=hidden name=shiptoemail value="$form->{shiptoemail}">
-<input type=hidden name=shiptodepartment_1 value="$form->{shiptodepartment_1}">
-<input type=hidden name=shiptodepartment_2 value="$form->{shiptodepartment_2}">
-
-<!-- email variables -->
-<input type=hidden name=message value="$form->{message}">
-<input type=hidden name=email value="$form->{email}">
-<input type=hidden name=subject value="$form->{subject}">
-<input type=hidden name=cc value="$form->{cc}">
-<input type=hidden name=bcc value="$form->{bcc}">
+  # Let Lx-Office assign a new order number if the user hasn't changed the
+  # previous one. If it has been changed manually then use it as-is.
+  my $idx = $form->{type} =~ /_quotation$/ ? "quonumber" : "ordnumber";
+  $form->{$idx} =~ s/^\s*//g;
+  $form->{$idx} =~ s/\s*$//g;
+  if ($form->{saved_xyznumber} &&
+      ($form->{saved_xyznumber} eq $form->{$idx})) {
+    delete($form->{$idx});
+  }
 
-|;
+  &save;
 
-  @column_index =
-    (partnumber, description, qty, ship, unit, bin, serialnumber);
-
-  if ($form->{type} eq "ship_order") {
-    $column_data{ship} =
-        qq|<th class=listheading align=center width="auto">|
-      . $locale->text('Ship')
-      . qq|</th>|;
-  }
-  if ($form->{type} eq "receive_order") {
-    $column_data{ship} =
-        qq|<th class=listheading align=center width="auto">|
-      . $locale->text('Recd')
-      . qq|</th>|;
-  }
-
-  my $colspan = $#column_index + 1;
-
-  $column_data{partnumber} =
-    qq|<th class=listheading nowrap>| . $locale->text('Number') . qq|</th>|;
-  $column_data{description} =
-      qq|<th class=listheading nowrap>|
-    . $locale->text('Description')
-    . qq|</th>|;
-  $column_data{qty} =
-    qq|<th class=listheading nowrap>| . $locale->text('Qty') . qq|</th>|;
-  $column_data{unit} =
-    qq|<th class=listheading nowrap>| . $locale->text('Unit') . qq|</th>|;
-  $column_data{bin} =
-    qq|<th class=listheading nowrap>| . $locale->text('Bin') . qq|</th>|;
-  $column_data{serialnumber} =
-      qq|<th class=listheading nowrap>|
-    . $locale->text('Serial No.')
-    . qq|</th>|;
+  $lxdebug->leave_sub();
+}
 
-  print qq|
-  <tr>
-    <td>
-      <table width=100%>
-	<tr class=listheading>|;
+sub check_for_direct_delivery_yes {
+  $lxdebug->enter_sub();
 
-  map { print "\n$column_data{$_}" } @column_index;
+  $form->{direct_delivery_checked} = 1;
+  delete @{$form}{grep /^shipto/, keys %{ $form }};
+  map { s/^CFDD_//; $form->{$_} = $form->{"CFDD_${_}"} } grep /^CFDD_/, keys %{ $form };
+  $form->{shipto} = 1;
+  purchase_order();
+  $lxdebug->leave_sub();
+}
 
-  print qq|
-        </tr>
-|;
+sub check_for_direct_delivery_no {
+  $lxdebug->enter_sub();
 
-  for $i (1 .. $form->{rowcount} - 1) {
+  $form->{direct_delivery_checked} = 1;
+  delete @{$form}{grep /^shipto/, keys %{ $form }};
+  purchase_order();
 
-    # undo formatting
-    $form->{"ship_$i"} = $form->parse_amount(\%myconfig, $form->{"ship_$i"});
+  $lxdebug->leave_sub();
+}
 
-    # convert " to &quot;
-    map { $form->{"${_}_$i"} =~ s/\"/&quot;/g }
-      qw(partnumber description unit bin serialnumber);
-
-    $description = $form->{"description_$i"};
-    $description =~ s/\n/<br>/g;
-
-    $column_data{partnumber} =
-      qq|<td>$form->{"partnumber_$i"}<input type=hidden name="partnumber_$i" value="$form->{"partnumber_$i"}"></td>|;
-    $column_data{description} =
-      qq|<td>$description<input type=hidden name="description_$i" value="$form->{"description_$i"}"></td>|;
-    $column_data{qty} =
-        qq|<td align=right>|
-      . $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty)
-      . qq|<input type=hidden name="qty_$i" value="$form->{"qty_$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>$form->{"unit_$i"}<input type=hidden name="unit_$i" value="$form->{"unit_$i"}"></td>|;
-    $column_data{bin} =
-      qq|<td>$form->{"bin_$i"}<input type=hidden name="bin_$i" value="$form->{"bin_$i"}"></td>|;
-
-    $column_data{serialnumber} =
-      qq|<td><input name="serialnumber_$i" size=15 value="$form->{"serialnumber_$i"}"></td>|;
-
-    print qq|
-        <tr valign=top>|;
-
-    map { print "\n$column_data{$_}" } @column_index;
-
-    print qq|
-        </tr>
+sub check_for_direct_delivery {
+  $lxdebug->enter_sub();
 
-<input type=hidden name="orderitems_id_$i" value=$form->{"orderitems_id_$i"}>
-<input type=hidden name="id_$i" value=$form->{"id_$i"}>
-<input type=hidden name="assembly_$i" value="$form->{"assembly_$i"}">
-<input type=hidden name="partsgroup_$i" value="$form->{"partsgroup_$i"}">
+  if ($form->{direct_delivery_checked}
+      || (!$form->{shiptoname} && !$form->{shiptostreet} && !$form->{shipto_id})) {
+    $lxdebug->leave_sub();
+    return;
+  }
 
-|;
+  if ($form->{shipto_id}) {
+    Common->get_shipto_by_id(\%myconfig, $form, $form->{shipto_id}, "CFDD_");
 
+  } else {
+    map { $form->{"CFDD_${_}"} = $form->{$_ } } grep /^shipto/, keys %{ $form };
   }
 
-  print qq|
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-  <tr>
-    <td>
-|;
-
-  $form->{copies} = 1;
+  delete $form->{action};
+  $form->{VARIABLES} = [ map { { "key" => $_, "value" => $form->{$_} } } grep { ref $_ eq "" } keys %{ $form } ];
 
-  &print_options;
+  $form->header();
+  print $form->parse_html_template2("oe/check_for_direct_delivery");
 
-  print qq|
-    </td>
-  </tr>
-</table>
-<br>
-<input class=submit type=submit name=action value="|
-    . $locale->text('Update') . qq|">
-<input class=submit type=submit name=action value="|
-    . $locale->text('Print') . qq|">
-|;
+  $lxdebug->leave_sub();
 
-  if ($form->{type} eq 'ship_order') {
-    print qq|
-<input class=submit type=submit name=action value="|
-      . $locale->text('Ship to') . qq|">
-<input class=submit type=submit name=action value="|
-      . $locale->text('E-mail') . qq|">
-|;
-  }
+  exit 0;
+}
 
-  print qq|
+sub purchase_order {
+  $lxdebug->enter_sub();
 
-<input class=submit type=submit name=action value="|
-    . $locale->text('Done') . qq|">
+  if ($form->{type} eq 'sales_order') {
+    check_for_direct_delivery();
+  }
 
-<input type=hidden name=rowcount value=$form->{rowcount}>
+  if (   $form->{type} eq 'sales_quotation'
+      || $form->{type} eq 'request_quotation') {
+    OE->close_order(\%myconfig, \%$form);
+  }
 
-<input name=callback type=hidden value="$callback">
+  if ($form->{type} =~ /^sales_/) {
+    delete($form->{ordnumber});
+  }
 
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
+  $form->{cp_id} *= 1;
 
-</form>
+  $form->{title} = $locale->text('Add Purchase Order');
+  $form->{vc}    = "vendor";
+  $form->{type}  = "purchase_order";
 
-</body>
-</html>
-|;
+  &poso;
 
   $lxdebug->leave_sub();
 }
 
-sub done {
+sub sales_order {
   $lxdebug->enter_sub();
 
-  if ($form->{type} eq 'ship_order') {
-    $form->isblank("shippingdate", $locale->text('Shipping Date missing!'));
-  } else {
-    $form->isblank("shippingdate", $locale->text('Date received missing!'));
+  if (   $form->{type} eq 'sales_quotation'
+      || $form->{type} eq 'request_quotation') {
+    OE->close_order(\%myconfig, $form);
   }
 
-  $total = 0;
-  map {
-    $total += $form->{"ship_$_"} =
-      $form->parse_amount(\%myconfig, $form->{"ship_$_"})
-  } (1 .. $form->{rowcount} - 1);
+  if ($form->{type} eq "purchase_order") {
+    delete($form->{ordnumber});
+  }
+
+  $form->{cp_id} *= 1;
 
-  $form->error($locale->text('Nothing entered!')) unless $total;
+  $form->{title} = $locale->text('Add Sales Order');
+  $form->{vc}    = "customer";
+  $form->{type}  = "sales_order";
 
-  $form->redirect($locale->text('Inventory saved!'))
-    if OE->save_inventory(\%myconfig, \%$form);
-  $form->error($locale->text('Could not save!'));
+  &poso;
 
   $lxdebug->leave_sub();
 }
 
-sub search_transfer {
+sub poso {
   $lxdebug->enter_sub();
 
-  OE->get_warehouses(\%myconfig, \%$form);
-
-  # warehouse
-  if (@{ $form->{all_warehouses} }) {
-    $form->{selectwarehouse} = "<option>\n";
-    $form->{warehouse}       = qq|$form->{warehouse}--$form->{warehouse_id}|;
-
-    map { $form->{selectwarehouse} .= "<option>$_->{description}--$_->{id}\n" }
-      (@{ $form->{all_warehouses} });
-  } else {
-    $form->error($locale->text('Nothing to transfer!'));
-  }
+  $form->{transdate} = $form->current_date(\%myconfig);
+  delete $form->{duedate};
 
-  $form->{title} = $locale->text('Transfer Inventory');
+  $form->{closed} = 0;
 
-  $form->header;
+  $form->{old_employee_id} = $form->{employee_id};
+  $form->{old_salesman_id} = $form->{salesman_id};
 
-  print qq|
-<body>
+  # reset
+  map { delete $form->{$_} }
+    qw(id subject message cc bcc printed emailed queued customer vendor creditlimit creditremaining discount tradediscount oldinvtotal);
 
-<form method=post action=$form->{script}>
+  for $i (1 .. $form->{rowcount}) {
+    map({ $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig,
+                                                     $form->{"${_}_${i}"})
+            if ($form->{"${_}_${i}"}) }
+        qw(ship qty sellprice listprice basefactor));
+  }
 
-<table width=100%>
-  <tr>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>
-      <table>
-        <tr>
-          <th align=right nowrap>| . $locale->text('Transfer to') . qq|</th>
-          <td><select name=warehouse>$form->{selectwarehouse}</select></td>
-        </tr>
-	<tr>
-	  <th align="right" nowrap="true">| . $locale->text('Part Number') . qq|</th>
-	  <td><input name=partnumber size=20></td>
-	</tr>
-	<tr>
-	  <th align="right" nowrap="true">| . $locale->text('Description') . qq|</th>
-	  <td><input name=description size=40></td>
-	</tr>
-	<tr>
-	  <th align=right nowrap>| . $locale->text('Group') . qq|</th>
-	  <td><input name=partsgroup size=20></td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-</table>
+  &order_links;
 
-<br>
-<input type=hidden name=sort value=partnumber>
-<input type=hidden name=nextsub value=list_transfer>
+  &prepare_order;
 
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
+  # format amounts
+  for $i (1 .. $form->{rowcount} - 1) {
+    map { $form->{"${_}_$i"} =~ s/\"/&quot;/g }
+      qw(partnumber description unit);
+  }
 
-<input class=submit type=submit name=action value="|
-    . $locale->text('Continue') . qq|">
-</form>
+  map { $form->{$_} = $form->format_amount(\%myconfig, $form->{$_}, 0, "0") }
+    qw(creditlimit creditremaining);
 
-</body>
-</html>
-|;
+  &update;
 
   $lxdebug->leave_sub();
 }
 
-sub list_transfer {
+sub e_mail {
   $lxdebug->enter_sub();
 
-  OE->get_inventory(\%myconfig, \%$form);
-
-  $partnumber  = $form->escape($form->{partnumber});
-  $warehouse   = $form->escape($form->{warehouse});
-  $description = $form->escape($form->{description});
-  $partsgroup  = $form->escape($form->{partsgroup});
-
-  # construct href
-  $href =
-    "$form->{script}?path=$form->{path}&action=list_transfer&partnumber=$partnumber&warehouse=$warehouse&description=$description&partsgroup=$partsgroup&login=$form->{login}&password=$form->{password}";
-
-  # construct callback
-  $partnumber  = $form->escape($form->{partnumber},  1);
-  $warehouse   = $form->escape($form->{warehouse},   1);
-  $description = $form->escape($form->{description}, 1);
-  $partsgroup  = $form->escape($form->{partsgroup},  1);
-
-  $callback =
-    "$form->{script}?path=$form->{path}&action=list_transfer&partnumber=$partnumber&warehouse=$warehouse&description=$description&partsgroup=$partsgroup&login=$form->{login}&password=$form->{password}";
-
-  @column_index =
-    $form->sort_columns(
-      qw(partnumber description partsgroup make model warehouse qty transfer));
-
-  $column_header{partnumber} =
-      qq|<th><a class=listheading href=$href&sort=partnumber>|
-    . $locale->text('Part Number')
-    . qq|</a></th>|;
-  $column_header{description} =
-      qq|<th><a class=listheading href=$href&sort=description>|
-    . $locale->text('Description')
-    . qq|</a></th>|;
-  $column_header{partsgroup} =
-      qq|<th><a class=listheading href=$href&sort=partsgroup>|
-    . $locale->text('Group')
-    . qq|</a></th>|;
-  $column_header{warehouse} =
-      qq|<th><a class=listheading href=$href&sort=warehouse>|
-    . $locale->text('From')
-    . qq|</a></th>|;
-  $column_header{qty} =
-    qq|<th><a class=listheading>| . $locale->text('Qty') . qq|</a></th>|;
-  $column_header{transfer} =
-    qq|<th><a class=listheading>| . $locale->text('Transfer') . qq|</a></th>|;
-
-  $option = $locale->text('Transfer to');
-
-  ($warehouse, $warehouse_id) = split /--/, $form->{warehouse};
-
-  if ($form->{warehouse}) {
-    $option .= " : $warehouse";
-  }
-  if ($form->{partnumber}) {
-    $option .= "\n<br>" if ($option);
-    $option .= $locale->text('Part Number') . " : $form->{partnumber}";
-  }
-  if ($form->{description}) {
-    $option .= "\n<br>" if ($option);
-    $option .= $locale->text('Description') . " : $form->{description}";
-  }
-  if ($form->{partsgroup}) {
-    $option .= "\n<br>" if ($option);
-    $option .= $locale->text('Group') . " : $form->{partsgroup}";
-  }
-
-  $form->{title} = $locale->text('Transfer Inventory');
+  $form->{print_and_save} = 1;
 
-  $form->header;
+  $print_post = 1;
 
-  print qq|
-<body>
+  my $saved_form = save_form();
 
-<form method=post action=$form->{script}>
+  save();
 
-<input type=hidden name=warehouse_id value=$warehouse_id>
+  my %saved_vars;
+  map({ $saved_vars{$_} = $form->{$_}; } qw(id ordnumber quonumber));
+  restore_form($saved_form);
+  map({ $form->{$_} = $saved_vars{$_}; } qw(id ordnumber quonumber));
 
-<table width=100%>
-  <tr>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>$option</td>
-  </tr>
-  <tr>
-    <td>
-      <table width=100%>
-	<tr class=listheading>|;
+  edit_e_mail();
+
+  $lxdebug->leave_sub();
+}
 
-  map { print "\n$column_header{$_}" } @column_index;
+sub yes {
+  call_sub($form->{yes_nextsub});
+}
 
-  print qq|
-	</tr>
-|;
+sub no {
+  call_sub($form->{no_nextsub});
+}
+
+######################################################################################################
+# IO ENTKOPPLUNG
+# ###############################################################################################
+sub display_form {
+  $lxdebug->enter_sub();
 
-  if (@{ $form->{all_inventory} }) {
-    $sameitem = $form->{all_inventory}->[0]->{ $form->{sort} };
+  $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"} = "";
 
-  $i = 0;
-  foreach $ref (@{ $form->{all_inventory} }) {
+  for my $i (1 .. $form->{"rowcount"}) {
+    IC->retrieve_accounts(\%myconfig, $form, $form->{"id_$i"}, $i, 1) if $form->{"id_$i"};
+  }
 
-    $i++;
+  $form->{rowcount}++;
+  $form->{"project_id_$form->{rowcount}"} = $form->{globalproject_id};
 
-    $column_data{partnumber} =
-      qq|<td><input type=hidden name="id_$i" value=$ref->{id}>$ref->{partnumber}</td>|;
-    $column_data{description} = "<td>$ref->{description}&nbsp;</td>";
-    $column_data{partsgroup}  = "<td>$ref->{partsgroup}&nbsp;</td>";
-    $column_data{warehouse}   =
-      qq|<td><input type=hidden name="warehouse_id_$i" value=$ref->{warehouse_id}>$ref->{warehouse}&nbsp;</td>|;
-    $column_data{qty} =
-        qq|<td><input type=hidden name="qty_$i" value=$ref->{qty}>|
-      . $form->format_amount(\%myconfig, $ref->{qty}, $dec_qty)
-      . qq|</td>|;
-    $column_data{transfer} = qq|<td><input name="transfer_$i" size=4></td>|;
+  $form->language_payment(\%myconfig);
 
-    $j++;
-    $j %= 2;
-    print "
-        <tr class=listrow$j>";
+  Common::webdav_folder($form) if ($webdav);
 
-    map { print "\n$column_data{$_}" } @column_index;
+  &form_header;
 
-    print qq|
-	</tr>
-|;
+  # create rows
+  display_row($form->{rowcount}) if $form->{rowcount};
 
-  }
+  &form_footer;
 
-  print qq|
-      </table>
-    </td>
-  </tr>
+  $lxdebug->leave_sub();
+}
 
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-</table>
+sub display_row {
+  $lxdebug->enter_sub();
+  my $numrows = shift;
+
+  # column_index
+  my @header_sort = qw(runningnumber partnumber description ship qty unit sellprice_pg sellprice discount linetotal);
+  my @HEADER = (
+    {  id => 'runningnumber', width => 5,     value => $locale->text('No.'),                  display => 1, },
+    {  id => 'partnumber',    width => 12,    value => $locale->text('Number'),               display => 1, },
+    {  id => 'description',   width => 30,    value => $locale->text('Part Description'),     display => 1, },
+    {  id => 'ship',          width => 5,     value => ($form->{type} eq 'purchase_order' ? $locale->text('Ship rcvd') : $locale->text('Ship')),                 
+       display => $form->{type} =~ /sales_order/ || ($form->{type} =~ /purchase_order/ && !($lizenzen && $form->{vc} eq "customer")) , },
+    {  id => 'qty',           width => 5,     value => $locale->text('Qty'),                  display => 1, },
+    {  id => 'unit',          width => 5,     value => $locale->text('Unit'),                 display => 1, },
+    {  id => 'license',       width => 10,    value => $locale->text('License'),              display => 0, },
+    {  id => 'serialnr',      width => 10,    value => $locale->text('Serial No.'),           display => 0, },
+    {  id => 'projectnr',     width => 10,    value => $locale->text('Project'),              display => 0, },
+    {  id => 'sellprice',     width => 15,    value => $locale->text('Price'),                display => 1, },
+    {  id => 'sellprice_pg',  width => 15,    value => $locale->text('Pricegroup'),           display => $form->{type} =~ /^sales_/,  },
+    {  id => 'discount',      width => 5,     value => $locale->text('Discount'),             display => $form->{vc} eq 'customer', },
+    {  id => 'linetotal',     width => 10,    value => $locale->text('Extended'),             display => 1, },
+    {  id => 'bin',           width => 10,    value => $locale->text('Bin'),                  display => 0, },
+  ); 
+  my @column_index = map { $_->{id} } grep { $_->{display} } @HEADER;
+
+  # cache units
+  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 $colspan = scalar @column_index;
+
+  $form->{invsubtotal} = 0;
+  map { $form->{"${_}_base"} = 0 } (split(/ /, $form->{taxaccounts}));
+
+  # about details 
+  $myconfig{show_form_details} = 1                            unless (defined($myconfig{show_form_details}));
+  $form->{show_details}        = $myconfig{show_form_details} unless (defined($form->{show_details}));
+  # /about details
+
+  # translations, unused commented out
+#  $runningnumber = $locale->text('No.');
+  $deliverydate  = $locale->text('Delivery Date');
+  $serialnumber  = $locale->text('Serial No.');
+  $projectnumber = $locale->text('Project');
+#  $partsgroup    = $locale->text('Group');
+  $reqdate       = $locale->text('Reqdate');
+  $deliverydate  = $locale->text('Required by');
+
+  # special alignings
+  my %align = map { $_ => 'right' } qw(qty ship right sellprice_pg discount linetotal);
+
+  $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"};
+  }
+
+  # rows
+  for $i (1 .. $numrows) {
 
-<br>
+    # undo formatting
+    map { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) } qw(qty ship discount sellprice price_new price_old) unless ($form->{simple_save});
+
+# unit begin
+    $form->{"unit_old_$i"}      ||= $form->{"unit_$i"};
+    $form->{"selected_unit_$i"} ||= $form->{"unit_$i"};
+
+    my $local_units = $form->{"inventory_accno_$i"} || $form->{"assembly_$i"} ? $dimension_units 
+                    : $form->{"id_$i"}                                        ? $service_units 
+                    :                                                           $all_units;
+    if (   !$local_units->{$form->{"selected_unit_$i"}}                                          # Die ausgewaehlte Einheit ist fuer diesen Artikel nicht gueltig
+        || !AM->convert_unit($form->{"selected_unit_$i"}, $form->{"unit_old_$i"}, $all_units)) { # (z.B. Dimensionseinheit war ausgewaehlt, es handelt sich aber
+      $form->{"unit_old_$i"} = $form->{"selected_unit_$i"} = $form->{"unit_$i"};                 # um eine Dienstleistung). Dann keinerlei Umrechnung vornehmen.
+    }
+    # adjust prices by unit, ignore if pricegroup changed
+    if ((!$form->{"prices_$i"}) || ($form->{"new_pricegroup_$i"} == $form->{"old_pricegroup_$i"})) {
+        $form->{"sellprice_$i"} *= AM->convert_unit($form->{"selected_unit_$i"}, $form->{"unit_old_$i"}, $all_units) || 1;
+        $form->{"unit_old_$i"}   = $form->{"selected_unit_$i"};
+    }
+    my $this_unit = $form->{"unit_$i"};
+    $this_unit    = $form->{"selected_unit_$i"} if AM->convert_unit($this_unit, $form->{"selected_unit_$i"}, $all_units);
+    $this_unit  ||= "kg";
 
-<input name=callback type=hidden value="$callback">
+    $column_data{"unit"} = AM->unit_select_html($local_units, "unit_$i", $this_unit, $form->{"id_$i"} ? $form->{"unit_$i"} : undef);
+# / unit ending
 
-<input type=hidden name=rowcount value=$i>
+    $form->{"sellprice_$i"} =~ /\.(\d+)/;
+    $decimalplaces = max 2, length $1;
 
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
+    $discount  = $form->round_amount($form->{"sellprice_$i"} * $form->{"discount_$i"} / 100, $decimalplaces);
+    $linetotal = $form->round_amount($form->{"sellprice_$i"} - $discount, $decimalplaces);
+    $linetotal = $form->round_amount($linetotal * $form->{"qty_$i"}, 2);
 
-<input class=submit type=submit name=action value="|
-    . $locale->text('Transfer') . qq|">
+    # convert " to &quot;
+    map { $form->{"${_}_$i"} =~ s/\"/&quot;/g } qw(partnumber description unit unit_old);
+
+    $column_data{runningnumber} = $cgi->textfield(-name => "runningnumber_$i", -size => 5,  -value => $i);    # HuT
+    $column_data{partnumber}    = $cgi->textfield(-name => "partnumber_$i",    -size => 12, -value => $form->{"partnumber_$i"});
+    $column_data{description} = ((($rows = $form->numtextrows($form->{"description_$i"}, 30, 6)) > 1) # if description is too large, use a textbox instead
+                                ? $cgi->textarea( -name => "description_$i", -default => H($form->{"description_$i"}), -rows => $rows, -columns => 30)
+                                : $cgi->textfield(-name => "description_$i",   -size => 30, -value => $form->quote($form->{"description_$i"})))
+                                . $cgi->button(-value => $locale->text('L'), -onClick => "set_longdescription_window('longdescription_$i')");
+
+    $form->{"qty_$i"} =~ /\.(\d+)/;
+    my $qty_dec = length $1;
+
+    $column_data{qty}  = $cgi->textfield(-name => "qty_$i", -size => 5, -value => $form->format_amount(\%myconfig, $form->{"qty_$i"}, $qty_dec));
+    $column_data{qty} .= $cgi->button(-onclick => "calculate_qty_selection_window('qty_$i','alu_$i', 'formel_$i', $i)", -value => $locale->text('*/'))
+                       . $cgi->hidden(-name => "formel_$i", -value => $form->{"formel_$i"}) . $cgi->hidden("-name" => "alu_$i", "-value" => $form->{"alu_$i"})
+      if $form->{"formel_$i"};
+    $column_data{ship} = $cgi->textfield(-name => "ship_$i", -size => 5, -value => $form->format_amount(\%myconfig, $form->{"ship_$i"}));
+
+    # build in drop down list for pricesgroups
+    if ($form->{"prices_$i"}) {
+      $column_data{sellprice_pg} = qq|<select name="sellprice_pg_$i">$form->{"prices_$i"}</select>|;
+      $column_data{sellprice}    = $cgi->textfield(-name => "sellprice_$i", -size => 10, -onBlur => 'check_right_number_format(this)', -value =>
+                                   (($form->{"new_pricegroup_$i"} != $form->{"old_pricegroup_$i"})
+                                      ? $form->format_amount(\%myconfig, $form->{"price_new_$i"}, $decimalplaces)
+                                      : $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces)));
+    } else {
+      # for last row and report
+      # set pricegroup drop down list from report menu
+      if ($form->{"sellprice_$i"} != 0) {
+        $form->{"pricegroup_old_$i"} = $form->{"pricegroup_id_$i"};
+        my $default_option           = $form->{"sellprice_$i"}.'--'.$form->{"pricegroup_id_$i"};
+        $column_data{sellprice_pg}   = NTI($cgi->popup_menu("sellpricepg_$i", [ $default_option ], $default_option, { $default_option => $form->{"pricegroup_$i"} || '' }));
+      } else {
+        $column_data{sellprice_pg} = qq|&nbsp;|;
+      }
+      $column_data{sellprice} = $cgi->textfield(-name => "sellprice_$i", -size => 10, -onBlur => "check_right_number_format(this)", -value =>
+                                                $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces));
+    }
+    $column_data{discount}    = $cgi->textfield(-name => "discount_$i", -size => 3, -value => $form->format_amount(\%myconfig, $form->{"discount_$i"}));
+    $column_data{linetotal}   = $form->format_amount(\%myconfig, $linetotal, 2);
+    $column_data{bin}         = $form->{"bin_$i"};
+
+    my @ROW1 = map { value => $column_data{$_}, align => $align{$_} }, @column_index;
+
+    # second row
+    my @ROW2 = ();
+    push @ROW2, { value => qq|<b>$serialnumber</b> <input name="serialnumber_$i" size="15" value="$form->{"serialnumber_$i"}">| } 
+      if $form->{type} !~ /_quotation/;
+    push @ROW2, { value => qq|<b>$projectnumber</b> | . NTI($cgi->popup_menu('-name'  => "project_id_$i",        '-values'  => \@projectnumber_values,
+                                                                             '-labels' => \%projectnumber_labels, '-default' => $form->{"project_id_$i"})) };
+    push @ROW2, { value => qq|<b>$reqdate</b> <input name="reqdate_$i" size="11" onBlur="check_right_date_format(this)" value="$form->{"reqdate_$i"}">| }
+      if $form->{type} =~ /order/;
+    push @ROW2, { value => sprintf qq|<b>%s</b>&nbsp;<input type="checkbox" name="subtotal_$i" value="1" %s>|, 
+                   $locale->text('Subtotal'), $form->{"subtotal_$i"} ? 'checked' : '' };
+
+# begin marge calculations
+    my $marge_color;
+    my $real_sellprice = $form->{"sellprice_$i"} - $discount;
+
+    $form->{"lastcost_$i"} *= 1;
+    $form->{"marge_percent_$i"} = 0;
+
+    if ($real_sellprice && ($form->{"qty_$i"} * 1)) {
+      $form->{"marge_percent_$i"}     = ($real_sellprice - $form->{"lastcost_$i"}) * 100 / $real_sellprice;
+      $myconfig{marge_percent_warn} ||= 15;
+      $marge_color                    = 'color="#ff0000"' if $form->{"id_$i"} && ($form->{"marge_percent_$i"} < (1 * $myconfig{marge_percent_warn}));
+    }
 
-</form>
+    my $marge_adjust_credit_note = $form->{type} eq 'credit_note' ? -1 : 1;
+    $form->{"marge_absolut_$i"}  = ($real_sellprice - $form->{"lastcost_$i"}) * $form->{"qty_$i"} * $marge_adjust_credit_note;
+    $form->{"marge_total"}      += $form->{"marge_absolut_$i"};
+    $form->{"lastcost_total"}   += $form->{"lastcost_$i"} * $form->{"qty_$i"};
+    $form->{"sellprice_total"}  += $real_sellprice * $form->{"qty_$i"};
+
+    map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}, 2) } qw(marge_absolut marge_percent);
+
+    push @ROW2, { value => sprintf qq|<font %s><b>%s</b> %s &nbsp;%s%% </font> &nbsp;<b>%s</b> %s &nbsp;<b>%s</b> %s|,
+                   $marge_color, $locale->text('Ertrag'),$form->{"marge_absolut_$i"}, $form->{"marge_percent_$i"},
+                   $locale->text('LP'), $form->format_amount(\%myconfig, $form->{"listprice_$i"}, 2),
+                   $locale->text('EK'), $form->format_amount(\%myconfig, $form->{"lastcost_$i"}, 2) }
+      if $form->{"id_$i"} && $form->{type} =~ /^sales_/;
+# / marge calculations ending
+
+    my @HIDDENS = map { value => $_}, (
+          $cgi->hidden("-name" => "unit_old_$i", "-value" => $form->{"selected_unit_$i"}),
+          $cgi->hidden("-name" => "price_new_$i", "-value" => $form->format_amount(\%myconfig, $form->{"price_new_$i"})),
+          map { ($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } map { $_."_$i" } 
+            qw(orderitems_id bo pricegroup_old price_old id inventory_accno bin partsgroup partnotes
+               income_accno expense_accno listprice assembly taxaccounts ordnumber transdate cusordnumber
+               longdescription basefactor marge_absolut marge_percent lastcost)
+    );
 
-</body>
-</html>
-|;
+    map { $form->{"${_}_base"} += $linetotal } (split(/ /, $form->{"taxaccounts_$i"}));
 
-  $lxdebug->leave_sub();
-}
+    $form->{invsubtotal} += $linetotal;
 
-sub transfer {
-  $lxdebug->enter_sub();
+    push @ROWS, { ROW1 => \@ROW1, ROW2 => \@ROW2, HIDDENS => \@HIDDENS, colspan => $colspan, };
+  }
 
-  $form->redirect($locale->text('Inventory transferred!'))
-    if OE->transfer(\%myconfig, \%$form);
-  $form->error($locale->text('Could not transfer Inventory!'));
+  print $form->parse_html_template2('oe/sales_order', { ROWS   => \@ROWS,
+                                                        HEADER => \@HEADER,
+                                                      });
+
+  if (0 != ($form->{sellprice_total} * 1)) {
+    $form->{marge_percent} = ($form->{sellprice_total} - $form->{lastcost_total}) / $form->{sellprice_total} * 100;
+  }
 
   $lxdebug->leave_sub();
 }