Änderungen zum vorherigen Commit, um die Funktionen rouster zu machen.

diff --git a/SL/IS.pm b/SL/IS.pm
index 3b0e15666966670a384a1dd0a4175adc8724ca59..7c923b0dd4b7461e6559e26cbec3c45623e13b1b 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -1954,38 +1954,6 @@ sub retrieve_item {
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }
 

-##########################
-# Get data for the submitted order id
-# from database
-#
-sub get_order_data {
-
-  $main::lxdebug->enter_sub();
-
-  my $self      = shift;
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $dbh      = $form->get_standard_dbh();
-
-  my @values = (conv_i($form->{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);
-
-  $dbh->disconnect;
-
-  $main::lxdebug->leave_sub();
-
-  return $result;
-}
-

 ##########################
 # get pricegroups from database
 # build up selected pricegroup
 ##########################
 # get pricegroups from database
 # build up selected pricegroup

diff --git a/SL/OE.pm b/SL/OE.pm
index 1bf8a719a94010a6c503817142e5c56ff927485c..3f7dbaa75d3f14c97337b88ca245225cd4cc5437 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -1307,4 +1307,37 @@ sub project_description {
   return $value;
 }
 
   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;
 1;

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index ad0c99080d941e0355f9327d9a02b43c9894b771..aa75ebe25bd720b1c375f854c58a6db30a507672 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -34,6 +34,7 @@
 use SL::FU;
 use SL::IS;
 use SL::PE;
 use SL::FU;
 use SL::IS;
 use SL::PE;

+use SL::OE;

 use Data::Dumper;
 use List::Util qw(max sum);
 
 use Data::Dumper;
 use List::Util qw(max sum);
 


@@ -156,7 +157,7 @@ sub invoice_links {
   }
 
   # Load data for a specific order and update form fields
   }
 
   # Load data for a specific order and update form fields

-  my $order_data = IS->get_order_data();
+  my $order_data = OE->get_order_data_by_ordnumber(%$form);

 
   # Copy the fields we need to %form
   for my $key (qw(payment_id salesman_id orddate taxzone_id quonumber)) {
 
   # Copy the fields we need to %form
   for my $key (qw(payment_id salesman_id orddate taxzone_id quonumber)) {