Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp

diff --git a/SL/OE.pm b/SL/OE.pm
index b9aba5c..63fcf1f 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -1285,39 +1285,6 @@ sub project_description {
   return $value;
 }
 
-##########################
-# Get data for the submitted order id
-# from database
-#
-sub get_order_data_by_ordnumber {
-  $main::lxdebug->enter_sub();
-
-  my $self      = shift;
-  my %params    = @_;
-
-  Common::check_params(\%params, qw(ordnumber));
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $dbh      = $form->get_standard_dbh();
-
-  my @values = ($params{ordnumber});
-
-  # We query the database for the fields we need using the submitted "ordnumber"
-  my $query = <<SQL;
-    SELECT o.payment_id, o.salesman_id, o.transdate AS orddate, o.taxzone_id, o.quonumber
-    FROM oe o
-    WHERE o.ordnumber = ?;
-SQL
-
-  # Do the actual query and return the results for later processing by our "frontend"
-  my $result = selectfirst_hashref_query($form, $dbh, $query, @values);
-
-  $main::lxdebug->leave_sub();
-
-  return $result;
-}
-
 1;
 
 __END__

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index b5e0927..7ac9f4d 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -155,14 +155,6 @@ sub invoice_links {
     $ref->{name} = $form->quote($ref->{name});
   }
 
-  # Load data for a specific order and update form fields
-  my $order_data = OE->get_order_data_by_ordnumber(%$form) if $form->{ordnumber};
-
-  # Copy the fields we need to %form
-  for my $key (qw(payment_id salesman_id orddate taxzone_id quonumber)) {
-    $form->{$key} = $order_data->{$key};
-  }
-
   $form->restore_vars(qw(id));
 
   IS->retrieve_invoice(\%myconfig, \%$form);