From: Thomas Heck <theck@linet-services.de>
Date: Thu, 18 Jul 2013 14:11:01 +0000 (+0200)
Subject: CustomerVendor: instance_conf komplett im Template verfügbar machen
X-Git-Tag: release-3.1.0beta1~157
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=4e78f69461dbfbeac4df98aea63c0ea9e97b8143;p=kivitendo-erp.git

CustomerVendor: instance_conf komplett im Template verfügbar machen
---

diff --git a/SL/Controller/CustomerVendor.pm b/SL/Controller/CustomerVendor.pm
index cc2af359a..a8b9c4544 100644
--- a/SL/Controller/CustomerVendor.pm
+++ b/SL/Controller/CustomerVendor.pm
@@ -682,7 +682,7 @@ sub _create_customer_vendor {
 sub _pre_render {
   my ($self) = @_;
 
-  $self->{template_args}->{conf_vertreter} = $::instance_conf->get_vertreter();
+  $self->{template_args}->{instance_conf} = $::instance_conf;
 
   my $dbh = $::form->get_standard_dbh();
 
diff --git a/templates/webpages/customer_vendor/tabs/billing.html b/templates/webpages/customer_vendor/tabs/billing.html
index 979ccbc53..531121177 100644
--- a/templates/webpages/customer_vendor/tabs/billing.html
+++ b/templates/webpages/customer_vendor/tabs/billing.html
@@ -8,7 +8,7 @@
 
     <tr height="5"></tr>
 
-    [% IF ( conf_vertreter ) %]
+    [% IF ( instance_conf.get_vertreter ) %]
       <tr>
         <th align="right">
           [% IF SELF.is_vendor() %]
@@ -292,7 +292,7 @@
     </tr>
 
     <tr>
-      [% IF ( !conf_vertreter ) %]
+      [% IF ( !instance_conf.get_vertreter ) %]
         <th align="right">
           [% IF ( SELF.is_vendor() ) %]
             [% 'Type of Vendor' | $T8 %]
@@ -349,7 +349,7 @@
       </td>
 
 
-      [% IF ( SELF.is_customer() && !conf_vertreter ) %]
+      [% IF ( SELF.is_customer() && !instance_conf.get_vertreter ) %]
         <th align="right">[% 'Salesman' | $T8 %]</th>
 
         <td>