From 6f30741b2ec6d7d68aa37d7dc6918fd058c22c7b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20B=C3=BCren?= <jan@kivitendo-premium.de>
Date: Thu, 15 Dec 2016 11:13:38 +0100
Subject: [PATCH] =?utf8?q?employee=5Fcompany=20und=20salesman=5Fcompany=20?=
 =?utf8?q?f=C3=BCr=20flattentoform?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Hintergrund: Bei automatisch generierten Rechnungen werden diese
beiden Druckvariablen nicht gefüllt. Mittlerweile sind diese aber
Mandantenspezifisch und nicht mehr an dem Benutzer gebunden.
Entsprechend den Wert aus instance_config geholt und für beide  Variablen
---
 SL/DB/Helper/FlattenToForm.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/SL/DB/Helper/FlattenToForm.pm b/SL/DB/Helper/FlattenToForm.pm
index cca17044b..3627cfa49 100644
--- a/SL/DB/Helper/FlattenToForm.pm
+++ b/SL/DB/Helper/FlattenToForm.pm
@@ -56,6 +56,8 @@ sub flatten_to_form {
     my $user = User->new(login => $self->employee->login);
     $form->{"employee_$_"} = $user->{$_} for qw(tel email fax);
   }
+  # company is employee and login independent
+  $form->{"${_}_company"}  = $::instance_conf->get_company for qw (employee salesman);
 
   $form->{employee}   = $self->employee->name          if _has($self, 'employee_id');
   $form->{language}   = $self->language->template_code if _has($self, 'language_id');
-- 
2.20.1