OE::, DO::order_details und IC::prepare_parts_for_printing mit lokaler form ...

und myconfig arbeiten lassen
Betrifft #2247.

diff --git a/SL/DO.pm b/SL/DO.pm
index 14a499a7cbbe21b596d6f21bc33d7b183a37dcb6..15e16cc16c44a96858cfdd5667ae19f1532fbb9f 100644 (file)
--- a/SL/DO.pm
+++ b/SL/DO.pm
@@ -740,10 +740,7 @@ sub retrieve {
 sub order_details {
   $main::lxdebug->enter_sub();
 
-  my ($self)   = @_;
-
-  my $myconfig = \%main::myconfig;
-  my $form     = $main::form;
+  my ($self, $myconfig, $form) = @_;
 
   # connect to database
   my $dbh = $form->get_standard_dbh($myconfig);
@@ -808,7 +805,7 @@ sub order_details {
   my $ic_cvar_configs = CVar->get_configs(module => 'IC');
 
   $form->{TEMPLATE_ARRAYS} = { };
-  IC->prepare_parts_for_printing();
+  IC->prepare_parts_for_printing(myconfig => $myconfig, form => $form);
 
   my @arrays =
     qw(runningnumber number description longdescription qty unit

diff --git a/SL/Form.pm b/SL/Form.pm
index 7aa380a158e0f5e0b8d202265818af2a1a26cc9d..810891ef9a8510a3679083aacc7e36ebbfc17a9a 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -3407,7 +3407,7 @@ sub prepare_for_printing {
   IC->retrieve_accounts(\%::myconfig, $self, map { $_ => $self->{"id_$_"} } 1 .. $self->{rowcount});
 
   if ($self->{type} =~ /_delivery_order$/) {
-    DO->order_details();
+    DO->order_details(\%::myconfig, $self);
   } elsif ($self->{type} =~ /sales_order|sales_quotation|request_quotation|purchase_order/) {
     OE->order_details(\%::myconfig, $self);
   } else {

diff --git a/SL/IC.pm b/SL/IC.pm
index 96e3a94a1be197c33cef5938d4cd4205d816fc5b..74cfe17023fa683234f52db6ad368d424a4ece55 100644 (file)
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -1632,8 +1632,8 @@ sub prepare_parts_for_printing {
   my $self     = shift;
   my %params   = @_;
 
-  my $myconfig = \%main::myconfig;
-  my $form     = $main::form;
+  my $myconfig = $params{myconfig} || \%main::myconfig;
+  my $form     = $params{form}     || $main::form;
 
   my $dbh      = $params{dbh} || $form->get_standard_dbh($myconfig);
 

diff --git a/SL/IS.pm b/SL/IS.pm
index 28323326f56ceb8027df6623cb4284a5e61ec9f9..ce8db64b96ab4325cc4c366ffdd9b85f13392dc0 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -144,7 +144,7 @@ sub invoice_details {
 
   $form->{discount} = [];
 
-  IC->prepare_parts_for_printing();
+  IC->prepare_parts_for_printing(myconfig => $myconfig, form => $form);
 
   my $ic_cvar_configs = CVar->get_configs(module => 'IC');
 

diff --git a/SL/OE.pm b/SL/OE.pm
index 94b97e9984fcf91e150d7b72922eabde74c41b99..3b3845c50dc135892ec8291cbad5a72ac10fa270 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -1111,7 +1111,7 @@ sub order_details {
   $form->{discount} = [];
 
   $form->{TEMPLATE_ARRAYS} = { };
-  IC->prepare_parts_for_printing();
+  IC->prepare_parts_for_printing(myconfig => $myconfig, form => $form);
 
   my $ic_cvar_configs = CVar->get_configs(module => 'IC');
 

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index d156767397defc3e4d67ffa9f02e45b4d71eda94..a7be6d7be3c418ee304f9bc1ae9dadc202e4ac21 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -1393,7 +1393,7 @@ sub print_form {
 
   # create the form variables
   if ($form->{type} =~ /_delivery_order$/) {
-    DO->order_details();
+    DO->order_details(\%myconfig, \%$form);
   } elsif ($order) {
     OE->order_details(\%myconfig, \%$form);
   } else {