Kunden > Lieferungen: die Übergabe der Lieferadressenid gefixt.

[mfinanz.git] / SL / Form.pm

diff --git a/SL/Form.pm b/SL/Form.pm
index e03916f1dfdf5371fda7e81248748696f699f89b..9cc1065f5eb4d90aa07c276565b2ab6a1fc29710 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -634,7 +634,6 @@ sub _prepare_html_template {
   $additional_params->{"conf_latex_templates"}        = $::lx_office_conf{print_templates}->{latex};
   $additional_params->{"conf_opendocument_templates"} = $::lx_office_conf{print_templates}->{opendocument};
   $additional_params->{"conf_vertreter"}              = $::lx_office_conf{features}->{vertreter};
   $additional_params->{"conf_latex_templates"}        = $::lx_office_conf{print_templates}->{latex};
   $additional_params->{"conf_opendocument_templates"} = $::lx_office_conf{print_templates}->{opendocument};
   $additional_params->{"conf_vertreter"}              = $::lx_office_conf{features}->{vertreter};

-  $additional_params->{"conf_show_best_before"}       = $::lx_office_conf{features}->{show_best_before};

   $additional_params->{"conf_parts_image_css"}        = $::lx_office_conf{features}->{parts_image_css};
   $additional_params->{"conf_parts_listing_images"}   = $::lx_office_conf{features}->{parts_listing_images};
   $additional_params->{"conf_parts_show_image"}       = $::lx_office_conf{features}->{parts_show_image};
   $additional_params->{"conf_parts_image_css"}        = $::lx_office_conf{features}->{parts_image_css};
   $additional_params->{"conf_parts_listing_images"}   = $::lx_office_conf{features}->{parts_listing_images};
   $additional_params->{"conf_parts_show_image"}       = $::lx_office_conf{features}->{parts_show_image};


@@ -1608,7 +1607,7 @@ sub get_exchangerate {
   my ($self, $dbh, $curr, $transdate, $fld) = @_;
   my ($query);
 
   my ($self, $dbh, $curr, $transdate, $fld) = @_;
   my ($query);
 

-  unless ($transdate) {
+  unless ($transdate && $curr) {

     $main::lxdebug->leave_sub();
     return 1;
   }
     $main::lxdebug->leave_sub();
     return 1;
   }


@@ -3582,7 +3581,6 @@ sub layout {
   my %style_to_script_map = (
     v3  => 'v3',
     neu => 'new',
   my %style_to_script_map = (
     v3  => 'v3',
     neu => 'new',

-    v4  => 'v4',

   );
 
   my $menu_script = $style_to_script_map{$::myconfig{menustyle}} || '';
   );
 
   my $menu_script = $style_to_script_map{$::myconfig{menustyle}} || '';