X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=5df76ed77da5bc9c323b5c2344cef73d72ad3580;hb=f3490e85153f60ce199993585fc11613185c3896;hp=af69e4488106bc8f1c873bdd96972462c7634505;hpb=3a94f4d2dd9a835d4a7007e1b999ea00b3c4e1cd;p=kivitendo-erp.git

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index af69e4488..5df76ed77 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -36,8 +36,8 @@
 #
 #######################################################################
 
+use Carp;
 use CGI;
-use CGI::Ajax;
 use List::Util qw(min max first);
 
 use SL::CVar;
@@ -112,7 +112,7 @@ sub display_row {
   my $form     = $main::form;
   my %myconfig = %main::myconfig;
   my $locale   = $main::locale;
-  my $cgi      = $main::cgi;
+  my $cgi      = $::request->{cgi};
 
   my $numrows = shift;
 
@@ -147,7 +147,6 @@ sub display_row {
     {  id => 'qty',           width => 5,     value => $locale->text('Qty'),                  display => 1, },
     {  id => 'price_factor',  width => 5,     value => $locale->text('Price Factor'),         display => !$is_delivery_order, },
     {  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 => !$is_delivery_order, },
@@ -350,13 +349,16 @@ sub display_row {
                    $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_/ ||  $form->{type} =~ /invoice/) && !$is_delivery_order;
+      if $form->{"id_$i"} && ($form->{type} =~ /^sales_/ ||  $form->{type} =~ /invoice/ || $form->{type} =~ /^credit_note$/ ) && !$is_delivery_order;
+
+    $form->{"listprice_$i"} = $form->format_amount(\%myconfig, $form->{"listprice_$i"}, 2)
+      if $form->{"id_$i"} && ($form->{type} =~ /^sales_/ ||  $form->{type} =~ /invoice/) ;
 # / marge calculations ending
 
 # calculate onhand
     if ($form->{"id_$i"}) {
       my $part         = IC->get_basic_part_info(id => $form->{"id_$i"});
-      my $onhand_color = 'color="#ff0000"' if  $part->{onhand} < $part->{rop};
+      my $onhand_color = $part->{onhand} < $part->{rop} ? 'color="#ff0000"' : '';
       push @ROW2, { value => sprintf "<b>%s</b> <font %s>%s %s</font>",
                       $locale->text('On Hand'),
                       $onhand_color,
@@ -370,7 +372,7 @@ sub display_row {
 
     if ($is_delivery_order) {
       map { $form->{"${_}_${i}"} = $form->format_amount(\%myconfig, $form->{"${_}_${i}"}) } qw(sellprice discount lastcost);
-      push @hidden_vars, qw(sellprice discount price_factor_id lastcost);
+      push @hidden_vars, qw(sellprice discount not_discountable price_factor_id lastcost);
       push @hidden_vars, "stock_${stock_in_out}_sum_qty", "stock_${stock_in_out}";
     }
 
@@ -412,7 +414,7 @@ sub set_pricegroup {
 
   my $form     = $main::form;
   my $locale   = $main::locale;
-  my $cgi      = $main::cgi;
+  my $cgi      = $::request->{cgi};
 
   _check_io_auth();
 
@@ -437,148 +439,28 @@ sub set_pricegroup {
 sub select_item {
   $main::lxdebug->enter_sub();
 
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-  my $cgi      = $main::cgi;
+  my %params = @_;
+  my $mode   = $params{mode} || croak "Missing parameter 'mode'";
 
-# diese variable kommt schon in der methode display_row vor, kann man die besser wiederverwenden? @mb fragen.  ich check das jetzt erstmal so ein
-  my $is_purchase        = (first { $_ eq $form->{type} } qw(request_quotation purchase_order purchase_delivery_order)) || ($form->{script} eq 'ir.pl');
   _check_io_auth();
 
-  my @column_index = qw(ndx partnumber description rop onhand unit sellprice);
-  my %column_data;
-  $column_data{ndx}        = qq|<th>&nbsp;</th>|;
-  $column_data{partnumber} =
-    qq|<th class="listheading">| . $locale->text('Number') . qq|</th>|;
-  $column_data{description} =
-    qq|<th class="listheading">| . $locale->text('Part Description') . qq|</th>|;
-  $column_data{sellprice} =
-    qq|<th class="listheading">| . $locale->text('Price') . qq|</th>|;
-    if ($is_purchase){
-      $column_data{rop} =
-      qq|<th class="listheading">| . $locale->text('ROP') . qq|</th>|;
-    }# ende if $is_purchase -> Überschrift Mindestlagerbestand - ähnliche Prüfung weiter unten
-  $column_data{onhand} =
-    qq|<th class="listheading">| . $locale->text('Qty') . qq|</th>|;
-  $column_data{unit} =
-    qq|<th class="listheading">| . $locale->text('Unit') . qq|</th>|;
-  # list items with radio button on a form
-  $form->header;
-
-  my $title   = $locale->text('Select from one of the items below');
-  my $colspan = $#column_index + 1;
-
-  print qq|
-  <body>
-
-<form method="post" action="$form->{script}">
-
-<table width="100%">
-  <tr>
-    <th class="listtop" colspan="$colspan">$title</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr class="listheading">|;
-
-  map { print "\n$column_data{$_}" } @column_index;
-
-  print qq|</tr>|;
-
-  my @new_fields =
-    qw(bin listprice inventory_accno income_accno expense_accno unit weight
-       assembly taxaccounts partsgroup formel longdescription not_discountable
-       part_payment_id partnotes id lastcost price_factor_id price_factor);
-  push @new_fields, "lizenzen" if $::lx_office_conf{system}->{lizenzen};
-  push @new_fields, grep { m/^ic_cvar_/ } keys %{ $form->{item_list}->[0] };
-
-  my $i = 0;
-  my $j;
-  foreach my $ref (@{ $form->{item_list} }) {
-    my $checked = ($i++) ? "" : "checked";
-
-    if ($::lx_office_conf{system}->{lizenzen}) {
-      if ($ref->{inventory_accno} > 0) {
-        $ref->{"lizenzen"} = qq|<option></option>|;
-        foreach my $item (@{ $form->{LIZENZEN}{ $ref->{"id"} } }) {
-          $ref->{"lizenzen"} .=
-            qq|<option value=\"$item->{"id"}\">$item->{"licensenumber"}</option>|;
-        }
-        $ref->{"lizenzen"} .= qq|<option value="-1">Neue Lizenz</option>|;
-        $ref->{"lizenzen"} =~ s/\"/&quot;/g;
-      }
-    }
+  my $previous_form = $::auth->save_form_in_session(form => $::form);
+  $::form->{title}  = $::locale->text('Select from one of the items below');
+  $::form->header;
 
-    map { $ref->{$_} =~ s/\"/&quot;/g } qw(partnumber description unit);
-
-    my $display_sellprice  = $ref->{sellprice} * (1 - $form->{tradediscount});
-    $display_sellprice    /= $ref->{price_factor} if ($ref->{price_factor});
-    $display_sellprice     = $form->format_amount(\%myconfig, $display_sellprice, 2);
-
-    $column_data{ndx} =
-      qq|<td><input name="ndx" class="radio" type="radio" value="$i" $checked></td>|;
-    $column_data{partnumber} =
-      qq|<td><input name="new_partnumber_$i" type="hidden" value="$ref->{partnumber}">$ref->{partnumber}</td>|;
-    $column_data{description} =
-      qq|<td><input name="new_description_$i" type="hidden" value="$ref->{description}">$ref->{description}</td>|;
-    $column_data{sellprice} =
-      qq|<td align="right"><input name="new_sellprice_$i" type="hidden" value="$ref->{sellprice}">|
-      . $display_sellprice
-      . qq|</td>|;
-    $column_data{onhand} =
-      qq|<td align="right"><input name="new_onhand_$i" type="hidden" value="$ref->{onhand}">|
-      . $form->format_amount(\%myconfig, $ref->{onhand}, '', "&nbsp;")
-      . qq|</td>|;
-    if ($is_purchase){
-    $column_data{rop} =
-      qq|<td align="right"><input name="new_rop$i" type="hidden" value="$ref->{rop}">|
-      . $form->format_amount(\%myconfig, $ref->{rop}, '', "&nbsp;")
-      . qq|</td>|;
-    }# ende if $is_purchase -> Falls der Aufruf über eine Einkaufsmaske kam, handelt es sich um einen Lieferantenauftrag und uns interessiert auch die Mindestbestandsmenge
-    $column_data{unit} =
-      qq|<td>$ref->{unit}</td>|;
-    $j++;
-    $j %= 2;
-    print qq|
-<tr class=listrow$j>|;
-
-    map { print "\n$column_data{$_}" } @column_index;
-
-    print("</tr>\n");
-
-    print join "\n", map { $cgi->hidden("-name" => "new_${_}_$i", "-value" => $ref->{$_}) } @new_fields;
-    print "\n";
-  }
-
-  print qq|
-<tr><td colspan="8"><hr size="3" noshade></td></tr>
-</table>
-
-<input name="lastndx" type="hidden" value="$i">
-
-|;
+  my @item_list = map {
+    $_->{display_sellprice}  = $_->{sellprice} * (1 - $::form->{tradediscount});
+    $_->{display_sellprice} /= $_->{price_factor} if ($_->{price_factor});
+    $_;
+  } @{ $::form->{item_list} };
 
   # delete action variable
-  map { delete $form->{$_} } qw(action item_list header);
-
-  # save all other form variables
-  foreach my $key (keys %${form}) {
-    next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key}));
-    $form->{$key} =~ s/\"/&quot;/g;
-    print qq|<input name="$key" type="hidden" value="$form->{$key}">\n|;
-  }
-
-  print qq|
-<input type="hidden" name="nextsub" value="item_selected">
+  delete @{$::form}{qw(action item_list header)};
 
-<br>
-<input class="submit" type="submit" name="action" value="|
-    . $locale->text('Continue') . qq|">
-</form>
-
-</body>
-</html>
-|;
+  print $::form->parse_html_template('io/select_item', { PREVIOUS_FORM => $previous_form,
+                                                         MODE          => $mode,
+                                                         ITEM_LIST     => \@item_list,
+                                                         IS_PURCHASE   => $mode eq 'IS' });
 
   $main::lxdebug->leave_sub();
 }
@@ -591,16 +473,25 @@ sub item_selected {
 
   _check_io_auth();
 
-  # replace the last row with the checked row
-  my $i = $form->{rowcount};
-  $i = $form->{assembly_rows} if ($form->{item} eq 'assembly');
+  $::auth->restore_form_from_session($form->{select_item_previous_form} || croak('Missing previous form ID'), form => $form);
 
-  # index for new item
-  my $j = $form->{ndx};
+  my $mode = delete($form->{select_item_mode}) || croak 'Missing item selection mode';
+  my $id   = delete($form->{select_item_id})   || croak 'Missing item selection ID';
+  my $i    = $form->{ $mode eq 'IC' ? 'assembly_rows' : 'rowcount' };
 
-  #sk
-  #($form->{"sellprice_$i"},$form->{"$pricegroup_old_$i"}) = split /--/, $form->{"sellprice_$i"};
-  #$form->{"sellprice_$i"} = $form->{"sellprice_$i"};
+  $form->{"id_${i}"} = $id;
+
+  if ($mode eq 'IS') {
+    IS->retrieve_item(\%myconfig, \%$form);
+  } elsif ($mode eq 'IR') {
+    IR->retrieve_item(\%myconfig, \%$form);
+  } elsif ($mode eq 'IC') {
+    IC->assembly_item(\%myconfig, \%$form);
+  } else {
+    croak "Invalid item selection mode '${mode}'";
+  }
+
+  my $new_item = $form->{item_list}->[0] || croak "No item found for mode '${mode}' and ID '${id}'";
 
   # if there was a price entered, override it
   my $sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"});
@@ -614,18 +505,14 @@ sub item_selected {
   my $ic_cvar_configs = CVar->get_configs(module => 'IC');
   push @new_fields, map { "ic_cvar_$_->{name}" } @{ $ic_cvar_configs };
 
-  map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} } @new_fields;
+  map { $form->{"${_}_$i"} = $new_item->{$_} } @new_fields;
 
-  $form->{"marge_price_factor_$i"} = $form->{"new_price_factor_$j"};
+  $form->{"marge_price_factor_$i"} = $new_item->{price_factor};
 
   if ($form->{"part_payment_id_$i"} ne "") {
     $form->{payment_id} = $form->{"part_payment_id_$i"};
   }
 
-  if ($::lx_office_conf{system}->{lizenzen}) {
-    map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} } qw(lizenzen);
-  }
-
   my ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/);
   $dec           = length $dec;
   my $decimalplaces = ($dec > 2) ? $dec : 2;
@@ -665,12 +552,7 @@ sub item_selected {
 
   $form->{"runningnumber_$i"} = $i;
 
-  # delete all the new_ variables
-  for $i (1 .. $form->{lastndx}) {
-    map { delete $form->{"new_${_}_$i"} } @new_fields;
-  }
-
-  map { delete $form->{$_} } qw(ndx lastndx nextsub);
+  delete $form->{nextsub};
 
   # format amounts
   map {
@@ -703,11 +585,11 @@ sub new_item {
   $form->{old_callback} = $form->escape($form->{callback}, 1);
   $form->{callback}     = $form->escape("$form->{script}?action=display_form", 1);
 
-  # save all form variables except action in a previousform variable
-  my $previousform = join '&', map { my $value = $form->{$_}; $value =~ s/&/%26/; "$_=$value" } grep { !/action/ } keys %$form;
+  # save all form variables except action in the session and keep the key in the previousform variable
+  my $previousform = $::auth->save_form_in_session(skip_keys => [ qw(action) ]);
 
   my @HIDDENS;
-  push @HIDDENS,      { 'name' => 'previousform', 'value' => $form->escape($previousform, 1) };
+  push @HIDDENS,      { 'name' => 'previousform', 'value' => $previousform };
   push @HIDDENS, map +{ 'name' => $_,             'value' => $form->{$_} },                       qw(rowcount vc);
   push @HIDDENS, map +{ 'name' => $_,             'value' => $form->{"${_}_$form->{rowcount}"} }, qw(partnumber description unit);
   push @HIDDENS,      { 'name' => 'taxaccount2',  'value' => $form->{taxaccounts} };
@@ -1069,7 +951,7 @@ sub edit_e_mail {
                                      subject       => $subject,
                                      print_options => print_options('inline' => 1),
                                      HIDDEN        => [ map +{ name => $_, value => $form->{$_} }, @hidden_keys ],
-                                     SHOW_BCC      => $myconfig{role} eq 'admin' });
+                                     SHOW_BCC      => $::auth->assert('email_bcc', 'may fail') });
 
   $main::lxdebug->leave_sub();
 }
@@ -1429,11 +1311,13 @@ sub print_form {
   my $payment_id_saved = $form->{payment_id};
   my $salesman_id_saved = $form->{salesman_id};
   my $cp_id_saved = $form->{cp_id};
+  my $taxzone_id_saved = $form->{taxzone_id};
 
   call_sub("$form->{vc}_details") if ($form->{vc});
 
   $form->{language_id} = $language_saved;
   $form->{payment_id} = $payment_id_saved;
+  $form->{taxzone_id} = $taxzone_id_saved;
 
   $form->{"email"} = $saved_email if ($saved_email);
   $form->{"cc"}    = $saved_cc    if ($saved_cc);
@@ -1456,6 +1340,10 @@ sub print_form {
     $output_longdates = 1;
   }
 
+  # Store the output number format so that the template modules know
+  # how to parse the amounts back if requested.
+  $myconfig{output_numberformat} = $output_numberformat || $myconfig{numberformat};
+
   ($form->{employee}) = split /--/, $form->{employee};
 
   # create the form variables
@@ -1538,17 +1426,7 @@ sub print_form {
                    qw(invtotal ordtotal quototal subtotal linetotal
                       listprice sellprice netprice discount
                       tax taxbase total paid),
-                   grep({ /^linetotal_\d+$/ ||
-                            /^listprice_\d+$/ ||
-                            /^sellprice_\d+$/ ||
-                            /^netprice_\d+$/ ||
-                            /^taxbase_\d+$/ ||
-                            /^discount_\d+$/ ||
-                            /^paid_\d+$/ ||
-                            /^subtotal_\d+$/ ||
-                            /^total_\d+$/ ||
-                            /^tax_\d+$/
-                        } keys(%{$form})));
+                   grep({ /^(?:linetotal|nodiscount_linetotal|listprice|sellprice|netprice|taxbase|discount|p_discount|discount_sub|nodiscount_sub|paid|subtotal|total|tax)_\d+$/ } keys(%{$form})));
 
   reformat_numbers($output_numberformat, undef,
                    qw(qty price_factor),
@@ -1582,7 +1460,7 @@ sub print_form {
     $extension            = 'xls';
   }
 
-  my $email_extension = '_email' if (($form->{media} eq 'email') && (-f "$myconfig{templates}/$form->{formname}_email$form->{language}${printer_code}.${extension}"));
+  my $email_extension = (($form->{media} eq 'email') && (-f "$myconfig{templates}/$form->{formname}_email$form->{language}${printer_code}.${extension}")) ? '_email' : '';
 
   $form->{IN}         = "$form->{formname}${email_extension}$form->{language}${printer_code}.${extension}";
 
@@ -1745,226 +1623,40 @@ sub post_as_new {
 sub ship_to {
   $main::lxdebug->enter_sub();
 
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-  my $cgi      = $main::cgi;
-
   _check_io_auth();
 
-  if ($form->{second_run}) {
-    $form->{print_and_post} = 0;
-  }
+  $::form->{print_and_post} = 0 if $::form->{second_run};
 
-  my $title = $form->{title};
-  $form->{title} = $locale->text('Ship to');
+  map { $::form->{$_} = $::form->parse_amount(\%::myconfig, $::form->{$_}) } qw(exchangerate creditlimit creditremaining);
 
-  map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
-    qw(exchangerate creditlimit creditremaining);
-
-  my @shipto_vars =
-    qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry
-       shiptocontact shiptocp_gender shiptophone shiptofax shiptoemail
-       shiptodepartment_1 shiptodepartment_2);
-
-  my @addr_vars =
-    (qw(name department_1 department_2 street zipcode city country
-        contact email phone fax));
-
-  # get details for name
-  call_sub("$form->{vc}_details", @addr_vars);
-
-  my $number =
-    ($form->{vc} eq 'customer')
-    ? $locale->text('Customer Number')
-    : $locale->text('Vendor Number');
-
-  # sieht nicht nett aus, funktioniert aber
-  # das vorausgewählte select-feld wird über shiptocp_gender
-  # entsprechend vorbelegt
-  my $selected_m='';
-  my $selected_f='';
-  if ($form->{shiptocp_gender} eq 'm') {
-    $selected_m='selected';
-    $selected_f='';
-  } elsif ($form->{shiptocp_gender} eq 'f') {
-    $selected_m='';
-    $selected_f='selected';
-  }
+  # get details for customer/vendor
+  call_sub($::form->{vc} . "_details", qw(name department_1 department_2 street zipcode city country contact email phone fax), $::form->{vc} . "number");
 
   # get pricegroups for parts
-  IS->get_pricegroups_for_parts(\%myconfig, \%$form);
+  IS->get_pricegroups_for_parts(\%::myconfig, \%$::form);
 
   # build up html code for prices_$i
-  set_pricegroup($form->{rowcount});
-
-  my $nextsub = ($form->{display_form}) ? $form->{display_form} : "display_form";
+  set_pricegroup($::form->{rowcount});
 
-  $form->{rowcount}--;
+  $::form->{rowcount}--;
 
-  $form->header;
+  my @shipto_vars   = qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry
+                         shiptocontact shiptocp_gender shiptophone shiptofax shiptoemail
+                         shiptodepartment_1 shiptodepartment_2);
+  my $previous_form = $::auth->save_form_in_session(skip_keys => [ @shipto_vars, qw(header shipto_id) ]);
+  $::form->{title}  = $::locale->text('Ship to');
+  $::form->header;
 
-  print qq|
-<body>
-
-<form method="post" action="$form->{script}">
-
-<table width="100%">
-  <tr>
-    <td>
-      <table>
-        <tr class="listheading">
-          <th class="listheading" colspan="2" width="50%">|
-    . $locale->text('Billing Address') . qq|</th>
-          <th class="listheading" width="50%">|
-    . $locale->text('Shipping Address') . qq|</th>
-        </tr>
-        <tr height="5"></tr>
-        <tr>
-          <th align="right" nowrap>$number</th>
-          <td>$form->{"$form->{vc}number"}</td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>| . $locale->text('Company Name') . qq|</th>
-          <td>$form->{name}</td>
-          <td><input name="shiptoname" size="35" value="$form->{shiptoname}"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>| . $locale->text('Department') . qq|</th>
-          <td>$form->{department_1}</td>
-          <td><input name="shiptodepartment_1" size="35" value="$form->{shiptodepartment_1}"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>&nbsp;</th>
-          <td>$form->{department_2}</td>
-          <td><input name="shiptodepartment_2" size="35" value="$form->{shiptodepartment_2}"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>| . $locale->text('Street') . qq|</th>
-          <td>$form->{street}</td>
-          <td><input name="shiptostreet" size="35" value="$form->{shiptostreet}"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>| . $locale->text('Zipcode') . qq|</th>
-          <td>$form->{zipcode}</td>
-          <td><input name="shiptozipcode" size="35" value="$form->{shiptozipcode}"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>| . $locale->text('City') . qq|</th>
-          <td>$form->{city}</td>
-          <td><input name="shiptocity" size="35" value="$form->{shiptocity}"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>| . $locale->text('Country') . qq|</th>
-          <td>$form->{country}</td>
-          <td><input name="shiptocountry" size="35" value="$form->{shiptocountry}"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>| . $locale->text('Contact') . qq|</th>
-          <td>$form->{contact}</td>
-          <td><input name="shiptocontact" size="35" value="$form->{shiptocontact}"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>| . $locale->text('Gender') . qq|</th>
-          <td></td>
-          <td><select id="shiptocp_gender" name="shiptocp_gender">
-              <option value="m"| .  $selected_m . qq|>| . $locale->text('male') . qq|</option>
-              <option value="f"| .  $selected_f . qq|>| . $locale->text('female') . qq|</option>
-              </select>
-          </td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>| . $locale->text('Phone') . qq|</th>
-          <td>$form->{phone}</td>
-          <td><input name="shiptophone" size="20" value="$form->{shiptophone}"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>| . $locale->text('Fax') . qq|</th>
-          <td>$form->{fax}</td>
-          <td><input name="shiptofax" size="20" value="$form->{shiptofax}"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>| . $locale->text('E-mail') . qq|</th>
-          <td>$form->{email}</td>
-          <td><input name="shiptoemail" size="35" value="$form->{shiptoemail}"></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-| . $cgi->hidden("-name" => "nextsub", "-value" => $nextsub);
-;
-
-
-
-  # delete shipto
-  map({ delete $form->{$_} } (@shipto_vars, qw(header shipto_id)));
-  $form->{title} = $title;
-
-  foreach my $key (keys %$form) {
-    next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key}));
-    $form->{$key} =~ s/\"/&quot;/g;
-    print qq|<input type="hidden" name="$key" value="$form->{$key}">\n|;
-  }
-
-  print qq|
-
-<hr size="3" noshade>
-
-<br>
-<input class="submit" type="submit" name="action" value="|
-    . $locale->text('Continue') . qq|">
-</form>
-
-</body>
-</html>
-|;
+  print $::form->parse_html_template('io/ship_to', { previousform => $previous_form,
+                                                     nextsub      => $::form->{display_form} || 'display_form',
+                                                   });
 
   $main::lxdebug->leave_sub();
 }
 
-sub new_license {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-
-  _check_io_auth();
-
-  my $row = shift;
-
-  # change callback
-  $form->{old_callback} = $form->escape($form->{callback}, 1);
-  $form->{callback} = $form->escape("$form->{script}?action=display_form", 1);
-  $form->{old_callback} = $form->escape($form->{old_callback}, 1);
-
-  # delete action
-  delete $form->{action};
-  my $customer = $form->{customer};
-  map { $form->{"old_$_"} = $form->{"${_}_$row"} } qw(partnumber description);
-
-  # save all other form variables in a previousform variable
-  $form->{row} = $row;
-  my $previousform;
-  foreach my $key (keys %$form) {
-    next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key}));
-
-    # escape ampersands
-    $form->{$key} =~ s/&/%26/g;
-    $previousform .= qq|$key=$form->{$key}&|;
-  }
-  chop $previousform;
-  $previousform = $form->escape($previousform, 1);
-
-  $form->{script} = "licenses.pl";
-
-  map { $form->{$_} = $form->{"old_$_"} } qw(partnumber description);
-  map { $form->{$_} = $form->escape($form->{$_}, 1) }
-    qw(partnumber description);
-  $form->{callback} =
-    qq|$form->{script}?action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$form->{name}&type=$form->{type}&customer=$customer&partnumber=$form->{partnumber}&description=$form->{description}&previousform="$previousform"&initial=1|;
-  $form->redirect;
-
-  $main::lxdebug->leave_sub();
+sub ship_to_entered {
+  $::auth->restore_form_from_session(delete $::form->{previousform});
+  call_sub($::form->{nextsub});
 }
 
 sub relink_accounts {
@@ -2107,6 +1799,8 @@ sub _render_custom_variables_inputs {
       $description = $cvar->{description} . ' ';
     }
 
+    my $form_key = "ic_cvar_" . $cvar->{name} . "_$params{row}";
+
     push @{ $params{ROW2} }, {
       line_break     => $num_visible_cvars == 1,
       description    => $description,
@@ -2117,7 +1811,7 @@ sub _render_custom_variables_inputs {
          name_prefix       => 'ic_',
          name_postfix      => "_$params{row}",
          valid             => $cvar->{valid},
-         value             => $form->{"ic_cvar_" . $cvar->{name} . "_$params{row}"},
+         value             => CVar->parse($::form->{$form_key}, $cvar),
       }
     };
   }