Einkaufs-/Verkausfmasken: Wenn man auf "Liefeadresse" drückt, dann werden jetzt nur...

diff --git a/SL/IR.pm b/SL/IR.pm
index 5a4a2d7f90f082232e649dab167650af7f4ba79a..a6f66659e458d2df39d739ced16f777db5402267 100644 (file)
--- a/SL/IR.pm
+++ b/SL/IR.pm
@@ -1222,7 +1222,7 @@ sub retrieve_item {
 sub vendor_details {
   $main::lxdebug->enter_sub();
 
 sub vendor_details {
   $main::lxdebug->enter_sub();
 

-  my ($self, $myconfig, $form) = @_;
+  my ($self, $myconfig, $form, @wanted_vars) = @_;

 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);


@@ -1249,6 +1249,13 @@ sub vendor_details {
 
   # remove id and taxincluded before copy back
   delete @$ref{qw(id taxincluded)};
 
   # remove id and taxincluded before copy back
   delete @$ref{qw(id taxincluded)};

+
+  if (scalar(@wanted_vars) > 0) {
+    my %h_wanted_vars;
+    map({ $h_wanted_vars{$_} = 1; } @wanted_vars);
+    map({ delete($ref->{$_}) unless ($h_wanted_vars{$_}); } keys(%{$ref}));
+  }
+

   map { $form->{$_} = $ref->{$_} } keys %$ref;
 
   $sth->finish;
   map { $form->{$_} = $ref->{$_} } keys %$ref;
 
   $sth->finish;

diff --git a/SL/IS.pm b/SL/IS.pm
index 24f8f0f17f69c96e8cca5295a38c025f96c0ea82..cc8027b9ae0a98acc6d09f574e92eb225fe422f3 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -391,7 +391,7 @@ sub project_description {
 sub customer_details {
   $main::lxdebug->enter_sub();
 
 sub customer_details {
   $main::lxdebug->enter_sub();
 

-  my ($self, $myconfig, $form) = @_;
+  my ($self, $myconfig, $form, @wanted_vars) = @_;

 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);


@@ -416,6 +416,13 @@ sub customer_details {
 
   # remove id and taxincluded before copy back
   delete @$ref{qw(id taxincluded)};
 
   # remove id and taxincluded before copy back
   delete @$ref{qw(id taxincluded)};

+
+  if (scalar(@wanted_vars) > 0) {
+    my %h_wanted_vars;
+    map({ $h_wanted_vars{$_} = 1; } @wanted_vars);
+    map({ delete($ref->{$_}) unless ($h_wanted_vars{$_}); } keys(%{$ref}));
+  }
+

   map { $form->{$_} = $ref->{$_} } keys %$ref;
   $sth->finish;
 
   map { $form->{$_} = $ref->{$_} } keys %$ref;
   $sth->finish;
 

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index bd248030db783ba519368aa44bfb356513e8b158..4f36c7818abbd3137aed1b0f048108f6569fb6ed 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -2016,14 +2016,14 @@ sub print_form {
 
 sub customer_details {
   $lxdebug->enter_sub();
 
 sub customer_details {
   $lxdebug->enter_sub();

-  IS->customer_details(\%myconfig, \%$form);
+  IS->customer_details(\%myconfig, \%$form, @_);

   $lxdebug->leave_sub();
 }
 
 sub vendor_details {
   $lxdebug->enter_sub();
 
   $lxdebug->leave_sub();
 }
 
 sub vendor_details {
   $lxdebug->enter_sub();
 

-  IR->vendor_details(\%myconfig, \%$form);
+  IR->vendor_details(\%myconfig, \%$form, @_);

 
   $lxdebug->leave_sub();
 }
 
   $lxdebug->leave_sub();
 }


@@ -2051,8 +2051,13 @@ sub 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 shiptophone shiptofax shiptoemail
+       shiptodepartment_1 shiptodepartment_2);
+

   # get details for name
   # get details for name

-  &{"$form->{vc}_details"};
+  &{"$form->{vc}_details"}(@shipto_vars);

 
   $number =
     ($form->{vc} eq 'customer')
 
   $number =
     ($form->{vc} eq 'customer')


@@ -2155,8 +2160,7 @@ sub ship_to {
 |;
 
   # delete shipto
 |;
 
   # delete shipto

-  map { delete $form->{$_} }
-    qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax shiptoemail shiptodepartment_1 shiptodepartment_2 header);
+  map({ delete $form->{$_} } (@shipto_vars, qw(header)));

   $form->{title} = $title;
 
   foreach $key (keys %$form) {
   $form->{title} = $title;
 
   foreach $key (keys %$form) {