X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FCT.pm;h=b36cfa3e88bc3a55d6daf90e16331285e78d2e01;hb=89c9ff022d3f13e27ba6bda085df15707fcfb0eb;hp=b61a07a63145dd0a40299a4c346e70b5528887d5;hpb=9b3455eaa0e7ae850c48c17bcf53735e5d5416da;p=kivitendo-erp.git

diff --git a/SL/CT.pm b/SL/CT.pm
index b61a07a63..b36cfa3e8 100644
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -44,6 +44,9 @@ use SL::CVar;
 use SL::DBUtils;
 use SL::FU;
 use SL::Notes;
+use SL::TransNumber;
+
+use strict;
 
 sub get_tuple {
   $main::lxdebug->enter_sub();
@@ -62,7 +65,7 @@ sub get_tuple {
     qq|ORDER BY cp.cp_id LIMIT 1|;
   my $sth = prepare_execute_query($form, $dbh, $query, $form->{id});
 
-  my $ref = $sth->fetchrow_hashref(NAME_lc);
+  my $ref = $sth->fetchrow_hashref("NAME_lc");
 
   map { $form->{$_} = $ref->{$_} } keys %$ref;
 
@@ -116,14 +119,21 @@ sub get_tuple {
     if ($ref) {
       foreach my $key (keys %{ $ref }) {
         my $new_key       =  $key;
-        $new_key          =~ s/^([^_]+)/\U\1\E/;
+        $new_key          =~ s/^([^_]+)/\U$1\E/;
         $form->{$new_key} =  $ref->{$key};
       }
     }
   }
 
   # check if it is orphaned
-  my $arap = ( $form->{db} eq 'customer' ) ? "ar" : "ap";
+  my $arap      = ( $form->{db} eq 'customer' ) ? "ar" : "ap";
+  my $num_args  = 2;
+  my $makemodel = '';
+  if ($form->{db} eq 'vendor') {
+    $makemodel = qq| UNION SELECT 1 FROM makemodel mm WHERE mm.make = ?|;
+    $num_args++;
+  }
+
   $query =
     qq|SELECT a.id | .
     qq|FROM $arap a | .
@@ -133,8 +143,10 @@ sub get_tuple {
     qq|SELECT a.id | .
     qq|FROM oe a | .
     qq|JOIN $cv ct ON (a.${cv}_id = ct.id) | .
-    qq|WHERE ct.id = ?|;
-  my ($dummy) = selectrow_query($form, $dbh, $query, $form->{id}, $form->{id});
+    qq|WHERE ct.id = ?|
+    . $makemodel;
+  my ($dummy) = selectrow_query($form, $dbh, $query, (conv_i($form->{id})) x $num_args);
+
   $form->{status} = "orphaned" unless ($dummy);
 
   $dbh->disconnect;
@@ -146,6 +158,7 @@ sub populate_drop_down_boxes {
   $main::lxdebug->enter_sub();
 
   my ($self, $myconfig, $form, $provided_dbh) = @_;
+  my $query;
 
   my $dbh = $provided_dbh ? $provided_dbh : $form->dbconnect($myconfig);
 
@@ -155,8 +168,9 @@ sub populate_drop_down_boxes {
 
   # get shipto address
   $query =
-    qq|SELECT shipto_id, shiptoname, shiptodepartment_1 | .
-    qq|FROM shipto WHERE (trans_id = ?) AND (module = 'CT')|;
+    qq|SELECT shipto_id, shiptoname, shiptodepartment_1, shiptostreet, shiptocity
+       FROM shipto
+       WHERE (trans_id = ?) AND (module = 'CT')|;
   $form->{SHIPTO} = selectall_hashref_query($form, $dbh, $query, $form->{id});
 
   # get contacts
@@ -180,17 +194,10 @@ sub query_titles_and_greetings {
   $main::lxdebug->enter_sub();
 
   my ( $self, $myconfig, $form ) = @_;
-  my ( %tmp,  $ref );
+  my ( %tmp,  $ref, $query );
 
   my $dbh = $form->dbconnect($myconfig);
 
-  $query =
-    qq|SELECT DISTINCT(cp_greeting) | .
-    qq|FROM contacts | .
-    qq|WHERE cp_greeting ~ '[a-zA-Z]' | .
-    qq|ORDER BY cp_greeting|;
-  $form->{GREETINGS} = [ selectall_array_query($form, $dbh, $query) ];
-
   $query =
     qq|SELECT DISTINCT(greeting) | .
     qq|FROM customer | .
@@ -200,7 +207,7 @@ sub query_titles_and_greetings {
     qq|FROM vendor | .
     qq|WHERE greeting ~ '[a-zA-Z]' | .
     qq|ORDER BY greeting|;
-  my %tmp;
+
   map({ $tmp{$_} = 1; } selectall_array_query($form, $dbh, $query));
   $form->{COMPANY_GREETINGS} = [ sort(keys(%tmp)) ];
 
@@ -255,21 +262,12 @@ sub save_customer {
     }
 
   } else {
-    if (!$form->{customernumber} && $form->{business}) {
-      $form->{customernumber} =
-        $form->update_business($myconfig, $form->{business}, $dbh);
-    }
-    if (!$form->{customernumber}) {
-      $form->{customernumber} =
-        $form->update_defaults($myconfig, "customernumber", $dbh);
-    }
-
-    $query  = qq|SELECT c.id FROM customer c WHERE c.customernumber = ?|;
-    ($f_id) = selectrow_query($form, $dbh, $query, $form->{customernumber});
-    if ($f_id ne "") {
-      $main::lxdebug->leave_sub();
-      return 3;
-    }
+    my $customernumber      = SL::TransNumber->new(type        => 'customer',
+                                                   dbh         => $dbh,
+                                                   number      => $form->{customernumber},
+                                                   business_id => $form->{business},
+                                                   save        => 1);
+    $form->{customernumber} = $customernumber->create_unique unless $customernumber->is_unique;
 
     $query = qq|SELECT nextval('id')|;
     ($form->{id}) = selectrow_query($form, $dbh, $query);
@@ -301,12 +299,14 @@ sub save_customer {
     qq|terms = ?, | .
     qq|business_id = ?, | .
     qq|taxnumber = ?, | .
-    qq|sic_code = ?, | .
     qq|language = ?, | .
     qq|account_number = ?, | .
     qq|bank_code = ?, | .
     qq|bank = ?, | .
+    qq|iban = ?, | .
+    qq|bic = ?, | .
     qq|obsolete = ?, | .
+    qq|direct_debit = ?, | .
     qq|ustid = ?, | .
     qq|username = ?, | .
     qq|salesman_id = ?, | .
@@ -340,12 +340,14 @@ sub save_customer {
     conv_i($form->{terms}),
     conv_i($form->{business}),
     $form->{taxnumber},
-    $form->{sic},
     $form->{language},
     $form->{account_number},
     $form->{bank_code},
     $form->{bank},
+    $form->{iban},
+    $form->{bic},
     $form->{obsolete} ? 't' : 'f',
+    $form->{direct_debit} ? 't' : 'f',
     $form->{ustid},
     $form->{username},
     conv_i($form->{salesman_id}),
@@ -362,7 +364,6 @@ sub save_customer {
   $query = undef;
   if ( $form->{cp_id} ) {
     $query = qq|UPDATE contacts SET | .
-      qq|cp_greeting = ?, | .
       qq|cp_title = ?,  | .
       qq|cp_givenname = ?, | .
       qq|cp_name = ?, | .
@@ -378,10 +379,10 @@ sub save_customer {
       qq|cp_project = ?, | .
       qq|cp_privatphone = ?, | .
       qq|cp_privatemail = ?, | .
-      qq|cp_birthday = ? | .
+      qq|cp_birthday = ?, | .
+      qq|cp_gender = ? | .
       qq|WHERE cp_id = ?|;
     @values = (
-      $form->{cp_greeting},
       $form->{cp_title},
       $form->{cp_givenname},
       $form->{cp_name},
@@ -398,18 +399,18 @@ sub save_customer {
       $form->{cp_privatphone},
       $form->{cp_privatemail},
       $form->{cp_birthday},
+      $form->{cp_gender} eq 'f' ? 'f' : 'm',
       $form->{cp_id}
       );
   } elsif ( $form->{cp_name} || $form->{cp_givenname} ) {
     $query =
-      qq|INSERT INTO contacts ( cp_cv_id, cp_greeting, cp_title, cp_givenname,  | .
+      qq|INSERT INTO contacts ( cp_cv_id, cp_title, cp_givenname,  | .
       qq|  cp_name, cp_email, cp_phone1, cp_phone2, cp_abteilung, cp_fax, cp_mobile1, | .
       qq|  cp_mobile2, cp_satphone, cp_satfax, cp_project, cp_privatphone, cp_privatemail, | .
-      qq|  cp_birthday) | .
+      qq|  cp_birthday, cp_gender) | .
       qq|VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
     @values = (
       $form->{id},
-      $form->{cp_greeting},
       $form->{cp_title},
       $form->{cp_givenname},
       $form->{cp_name},
@@ -425,7 +426,8 @@ sub save_customer {
       $form->{cp_project},
       $form->{cp_privatphone},
       $form->{cp_privatemail},
-      $form->{cp_birthday}
+      $form->{cp_birthday},
+      $form->{cp_gender} eq 'f' ? 'f' : 'm',
       );
   }
   do_query( $form, $dbh, $query, @values ) if ($query);
@@ -439,9 +441,10 @@ sub save_customer {
   CVar->save_custom_variables('dbh'       => $dbh,
                               'module'    => 'CT',
                               'trans_id'  => $form->{id},
-                              'variables' => $form);
+                              'variables' => $form,
+                              'always_valid' => 1);
 
-  $rc = $dbh->commit();
+  my $rc = $dbh->commit();
   $dbh->disconnect();
 
   $main::lxdebug->leave_sub();
@@ -477,9 +480,11 @@ sub save_vendor {
     $query = qq|INSERT INTO vendor (id, name) VALUES (?, '')|;
     do_query($form, $dbh, $query, $form->{id});
 
-    if ( !$form->{vendornumber} ) {
-      $form->{vendornumber} = $form->update_defaults( $myconfig, "vendornumber", $dbh );
-    }
+    my $vendornumber      = SL::TransNumber->new(type   => 'vendor',
+                                                 dbh    => $dbh,
+                                                 number => $form->{vendornumber},
+                                                 save   => 1);
+    $form->{vendornumber} = $vendornumber->create_unique unless $vendornumber->is_unique;
   }
 
   $query =
@@ -506,12 +511,14 @@ sub save_vendor {
     qq|  creditlimit = ?, | .
     qq|  business_id = ?, | .
     qq|  taxnumber = ?, | .
-    qq|  sic_code = ?, | .
     qq|  language = ?, | .
     qq|  account_number = ?, | .
     qq|  bank_code = ?, | .
     qq|  bank = ?, | .
+    qq|  iban = ?, | .
+    qq|  bic = ?, | .
     qq|  obsolete = ?, | .
+    qq|  direct_debit = ?, | .
     qq|  ustid = ?, | .
     qq|  payment_id = ?, | .
     qq|  taxzone_id = ?, | .
@@ -520,7 +527,7 @@ sub save_vendor {
     qq|  user_password = ?, | .
     qq|  v_customer_id = ? | .
     qq|WHERE id = ?|;
-  @values = (
+  my @values = (
     $form->{vendornumber},
     $form->{name},
     $form->{greeting},
@@ -543,12 +550,14 @@ sub save_vendor {
     $form->{creditlimit},
     conv_i($form->{business}),
     $form->{taxnumber},
-    $form->{sic},
     $form->{language},
     $form->{account_number},
     $form->{bank_code},
     $form->{bank},
+    $form->{iban},
+    $form->{bic},
     $form->{obsolete} ? 't' : 'f',
+    $form->{direct_debit} ? 't' : 'f',
     $form->{ustid},
     conv_i($form->{payment_id}),
     conv_i($form->{taxzone_id}, 0),
@@ -563,7 +572,6 @@ sub save_vendor {
   $query = undef;
   if ( $form->{cp_id} ) {
     $query = qq|UPDATE contacts SET | .
-      qq|cp_greeting = ?, | .
       qq|cp_title = ?,  | .
       qq|cp_givenname = ?, | .
       qq|cp_name = ?, | .
@@ -579,10 +587,10 @@ sub save_vendor {
       qq|cp_project = ?, | .
       qq|cp_privatphone = ?, | .
       qq|cp_privatemail = ?, | .
-      qq|cp_birthday = ? | .
+      qq|cp_birthday = ?, | .
+      qq|cp_gender = ? | .
       qq|WHERE cp_id = ?|;
     @values = (
-      $form->{cp_greeting},
       $form->{cp_title},
       $form->{cp_givenname},
       $form->{cp_name},
@@ -599,18 +607,18 @@ sub save_vendor {
       $form->{cp_privatphone},
       $form->{cp_privatemail},
       $form->{cp_birthday},
+      $form->{cp_gender} eq 'f' ? 'f' : 'm',
       $form->{cp_id}
       );
   } elsif ( $form->{cp_name} || $form->{cp_givenname} ) {
     $query =
-      qq|INSERT INTO contacts ( cp_cv_id, cp_greeting, cp_title, cp_givenname,  | .
+      qq|INSERT INTO contacts ( cp_cv_id, cp_title, cp_givenname,  | .
       qq|  cp_name, cp_email, cp_phone1, cp_phone2, cp_abteilung, cp_fax, cp_mobile1, | .
       qq|  cp_mobile2, cp_satphone, cp_satfax, cp_project, cp_privatphone, cp_privatemail, | .
-      qq|  cp_birthday) | .
+      qq|  cp_birthday, cp_gender) | .
       qq|VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
     @values = (
       $form->{id},
-      $form->{cp_greeting},
       $form->{cp_title},
       $form->{cp_givenname},
       $form->{cp_name},
@@ -626,7 +634,8 @@ sub save_vendor {
       $form->{cp_project},
       $form->{cp_privatphone},
       $form->{cp_privatemail},
-      $form->{cp_birthday}
+      $form->{cp_birthday},
+      $form->{cp_gender}
       );
   }
   do_query($form, $dbh, $query, @values) if ($query);
@@ -640,9 +649,10 @@ sub save_vendor {
   CVar->save_custom_variables('dbh'       => $dbh,
                               'module'    => 'CT',
                               'trans_id'  => $form->{id},
-                              'variables' => $form);
+                              'variables' => $form,
+                              'always_valid' => 1);
 
-  $rc = $dbh->commit();
+  my $rc = $dbh->commit();
   $dbh->disconnect();
 
   $main::lxdebug->leave_sub();
@@ -680,13 +690,19 @@ sub search {
   my @values;
 
   my %allowed_sort_columns =
-    map({ $_, 1 } qw(id customernumber vendornumber name address contact phone fax email
-                     taxnumber sic_code business invnumber ordnumber quonumber));
-  $sortorder =
-    $form->{sort} && $allowed_sort_columns{$form->{sort}} ?
-    $form->{sort} : "name";
+    map { $_, 1 } qw(
+      id customernumber vendornumber name contact phone fax email street
+      taxnumber business invnumber ordnumber quonumber zipcode city
+    );
+  my $sortorder    = $form->{sort} && $allowed_sort_columns{$form->{sort}} ? $form->{sort} : "name";
   $form->{sort} = $sortorder;
-  $sortorder = "country,city,street" if ($sortorder eq "address");
+  my $sortdir   = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
+
+  if ($sortorder ne 'id' && 1 >= scalar grep { $form->{$_} } qw(l_ordnumber l_quonumber l_invnumber)) {
+    $sortorder  = "lower($sortorder) ${sortdir}";
+  } else {
+    $sortorder .= " ${sortdir}";
+  }
 
   if ($form->{"${cv}number"}) {
     $where .= " AND ct.${cv}number ILIKE ?";
@@ -700,6 +716,24 @@ sub search {
     }
   }
 
+  if ($form->{cp_name}) {
+    $where .= " AND ct.id IN (SELECT cp_cv_id FROM contacts WHERE lower(cp_name) LIKE lower(?))";
+    push @values, '%' . $form->{cp_name} . '%';
+  }
+
+  if ($form->{addr_city}) {
+    $where .= " AND ((lower(ct.city) LIKE lower(?))
+                     OR
+                     (ct.id IN (
+                        SELECT trans_id
+                        FROM shipto
+                        WHERE (module = 'CT')
+                          AND (lower(shiptocity) LIKE lower(?))
+                      ))
+                     )";
+    push @values, ('%' . $form->{addr_city} . '%') x 2;
+  }
+
   if ( $form->{status} eq 'orphaned' ) {
     $where .=
       qq| AND ct.id NOT IN | .
@@ -739,6 +773,16 @@ sub search {
     push @values, @cvar_values;
   }
 
+  if ($form->{addr_street}) {
+    $where .= qq| AND (street ILIKE ?)|;
+    push @values, '%' . $form->{addr_street} . '%';
+  }
+
+  if ($form->{addr_zipcode}) {
+    $where .= qq| AND (zipcode ILIKE ?)|;
+    push @values, $form->{addr_zipcode} . '%';
+  }
+
   my $query =
     qq|SELECT ct.*, b.description AS business | .
     qq|FROM $cv ct | .
@@ -804,8 +848,6 @@ sub search {
   $query .= qq| ORDER BY $sortorder|;
 
   $form->{CT} = selectall_hashref_query($form, $dbh, $query, @values);
-  map({ my $ref = $_; $ref->{address} = join(" ", map({ $ref->{$_} } qw(street zipcode city country))); }
-      @{ $form->{CT} });
 
   $main::lxdebug->leave_sub();
 }
@@ -819,7 +861,7 @@ sub get_contact {
     qq|SELECT * FROM contacts c | .
     qq|WHERE cp_id = ? ORDER BY cp_id limit 1|;
   my $sth = prepare_execute_query($form, $dbh, $query, $form->{cp_id});
-  my $ref = $sth->fetchrow_hashref(NAME_lc);
+  my $ref = $sth->fetchrow_hashref("NAME_lc");
 
   map { $form->{$_} = $ref->{$_} } keys %$ref;
 
@@ -845,7 +887,7 @@ sub get_shipto {
   my $query = qq|SELECT * FROM shipto WHERE shipto_id = ?|;
   my $sth = prepare_execute_query($form, $dbh, $query, $form->{shipto_id});
 
-  my $ref = $sth->fetchrow_hashref(NAME_lc);
+  my $ref = $sth->fetchrow_hashref("NAME_lc");
 
   map { $form->{$_} = $ref->{$_} } keys %$ref;
 
@@ -870,6 +912,7 @@ sub get_delivery {
 
   my $arap = $form->{db} eq "vendor" ? "ap" : "ar";
   my $db = $form->{db} eq "customer" ? "customer" : "vendor";
+  my $qty_sign = $form->{db} eq 'vendor' ? ' * -1 AS qty' : '';
 
   my $where = " WHERE 1=1 ";
   my @values;
@@ -891,9 +934,10 @@ sub get_delivery {
     push(@values, conv_date($form->{to}));
   }
   my $query =
-    qq|SELECT s.shiptoname, i.qty, | .
-    qq|  ${arap}.transdate, ${arap}.invnumber, ${arap}.ordnumber, | .
-    qq|  i.description, i.unit, i.sellprice | .
+    qq|SELECT s.shiptoname, i.qty $qty_sign, | .
+    qq|  ${arap}.id, ${arap}.transdate, ${arap}.invnumber, ${arap}.ordnumber, | .
+    qq|  i.description, i.unit, i.sellprice, | .
+    qq|  oe.id AS oe_id, invoice | .
     qq|FROM $arap | .
     qq|LEFT JOIN shipto s ON | .
     ($arap eq "ar"
@@ -901,6 +945,7 @@ sub get_delivery {
      : qq|(ap.id = s.trans_id) |) .
     qq|LEFT JOIN invoice i ON (${arap}.id = i.trans_id) | .
     qq|LEFT join parts p ON (p.id = i.parts_id) | .
+    qq|LEFT JOIN oe ON (oe.ordnumber = ${arap}.ordnumber AND NOT ${arap}.ordnumber = '') | .
     $where .
     qq|ORDER BY ${arap}.transdate DESC LIMIT 15|;
 
@@ -1000,26 +1045,118 @@ sub delete_shipto {
   my %myconfig  = %main::myconfig;
   my $dbh       = $form->get_standard_dbh(\%myconfig);
 
-  do_query($form, $dbh, qq|UPDATE shipto SET trans_id = NULL WHERE shipto_id = ?|, $shipto_id);
+  do_query($form, $dbh, qq|UPDATE contacts SET cp_cv_id = NULL WHERE cp_id = ?|, $shipto_id);
 
   $dbh->commit();
 
   $main::lxdebug->leave_sub();
 }
 
-sub delete_shipto {
+sub get_bank_info {
   $main::lxdebug->enter_sub();
 
-  my $self      = shift;
-  my $shipto_id = shift;
+  my $self     = shift;
+  my %params   = @_;
 
-  my $form      = $main::form;
-  my %myconfig  = %main::myconfig;
-  my $dbh       = $form->get_standard_dbh(\%myconfig);
+  Common::check_params(\%params, qw(vc id));
 
-  do_query($form, $dbh, qq|UPDATE contacts SET cp_cv_id = NULL WHERE cp_id = ?|, $shipto_id);
+  my $myconfig = \%main::myconfig;
+  my $form     = $main::form;
 
-  $dbh->commit();
+  my $dbh      = $params{dbh} || $form->get_standard_dbh($myconfig);
+
+  my $table        = $params{vc} eq 'customer' ? 'customer' : 'vendor';
+  my @ids          = ref $params{id} eq 'ARRAY' ? @{ $params{id} } : ($params{id});
+  my $placeholders = join ", ", ('?') x scalar @ids;
+  my $query        = qq|SELECT id, name, account_number, bank, bank_code, iban, bic
+                        FROM ${table}
+                        WHERE id IN (${placeholders})|;
+
+  my $result       = selectall_hashref_query($form, $dbh, $query, map { conv_i($_) } @ids);
+
+  if (ref $params{id} eq 'ARRAY') {
+    $result = { map { $_->{id} => $_ } @{ $result } };
+  } else {
+    $result = $result->[0] || { 'id' => $params{id} };
+  }
+
+  $main::lxdebug->leave_sub();
+
+  return $result;
+}
+
+sub parse_excel_file {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form) = @_;
+  my $locale = $main::locale;
+
+  $form->{formname}   = 'sales_quotation';
+  $form->{type}   = 'sales_quotation';
+  $form->{format} = 'excel';
+  $form->{media}  = 'screen';
+  $form->{quonumber} = 1;
+
+
+  # $form->{"notes"} will be overridden by the customer's/vendor's "notes" field. So save it here.
+  $form->{ $form->{"formname"} . "notes" } = $form->{"notes"};
+
+  my $inv                  = "quo";
+  my $due                  = "req";
+  $form->{"${inv}date"} = $form->{transdate};
+  $form->{label}        = $locale->text('Quotation');
+  my $numberfld            = "sqnumber";
+  my $order                = 1;
+
+  # assign number
+  $form->{what_done} = $form->{formname};
+
+  map({ delete($form->{$_}); } grep(/^cp_/, keys(%{ $form })));
+
+  my $output_dateformat = $myconfig->{"dateformat"};
+  my $output_numberformat = $myconfig->{"numberformat"};
+  my $output_longdates = 1;
+
+  # map login user variables
+  map { $form->{"login_$_"} = $myconfig->{$_} } ("name", "email", "fax", "tel", "company");
+
+  # format item dates
+  for my $field (qw(transdate_oe deliverydate_oe)) {
+    map {
+      $form->{$field}[$_] = $locale->date($myconfig, $form->{$field}[$_], 1);
+    } 0 .. $#{ $form->{$field} };
+  }
+
+  if ($form->{shipto_id}) {
+    $form->get_shipto($myconfig);
+  }
+
+  $form->{notes} =~ s/^\s+//g;
+
+  $form->{templates} = $myconfig->{templates};
+
+  delete $form->{printer_command};
+
+  $form->get_employee_info($myconfig);
+
+  my ($cvar_date_fields, $cvar_number_fields) = CVar->get_field_format_list('module' => 'CT', 'prefix' => 'vc_');
+
+  if (scalar @{ $cvar_date_fields }) {
+    format_dates($output_dateformat, $output_longdates, @{ $cvar_date_fields });
+  }
+
+  while (my ($precision, $field_list) = each %{ $cvar_number_fields }) {
+    reformat_numbers($output_numberformat, $precision, @{ $field_list });
+  }
+
+  $form->{excel} = 1;
+  my $extension            = 'xls';
+
+  $form->{IN}         = "$form->{formname}.${extension}";
+
+  delete $form->{OUT};
+
+  $form->parse_template($myconfig);
 
   $main::lxdebug->leave_sub();
 }