From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 17 Feb 2014 13:16:01 +0000 (+0100)
Subject: SL::Form->prepare_for_printing: Variablen aus %::myconfig sowie output_*format zur... 
X-Git-Tag: release-3.2.0beta~491^2~14
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;ds=sidebyside;h=db9ec33ad27c32416647a21d82217959aa34bf0f;hp=2714604a9184071fcb3986ac19056da50e5c4a4a;p=kivitendo-erp.git

SL::Form->prepare_for_printing: Variablen aus %::myconfig sowie output_*format zur Verfügung stellen
---

diff --git a/SL/Form.pm b/SL/Form.pm
index 218172427..0c532ce6e 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -3326,6 +3326,13 @@ sub prepare_for_printing {
   # compatibility.
   $self->{$_} = $defaults->$_ for qw(company address taxnumber co_ustid duns sepa_creditor_id);
 
+  $self->{"myconfig_${_}"} = $::myconfig{$_} for grep { $_ ne 'dbpasswd' } keys %::myconfig;
+
+  if (!$self->{employee_id}) {
+    $self->{"employee_${_}"} = $::myconfig{$_} for qw(email tel fax name signature);
+    $self->{"employee_${_}"} = $defaults->$_   for qw(address businessnumber co_ustid company duns sepa_creditor_id taxnumber);
+  }
+
   # set shipto from billto unless set
   my $has_shipto = any { $self->{"shipto$_"} } qw(name street zipcode city country contact);
   if (!$has_shipto && ($self->{type} =~ m/^(?:purchase_order|request_quotation)$/)) {
@@ -3344,6 +3351,10 @@ sub prepare_for_printing {
     $output_longdates    = 1;
   }
 
+  $self->{myconfig_output_dateformat}   = $output_dateformat;
+  $self->{myconfig_output_longdates}    = $output_longdates;
+  $self->{myconfig_output_numberformat} = $output_numberformat;
+
   # Retrieve accounts for tax calculation.
   IC->retrieve_accounts(\%::myconfig, $self, map { $_ => $self->{"id_$_"} } 1 .. $self->{rowcount});