From: Thomas Heck <theck@linet-services.de>
Date: Thu, 18 Jul 2013 14:31:04 +0000 (+0200)
Subject: CustomerVendor: im Templatesystem vorhandenes instance_conf verwenden
X-Git-Tag: release-3.1.0beta1~156
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=e72ecdf83cabbb6f630ec33efd15e7615b69a676;p=kivitendo-erp.git

CustomerVendor: im Templatesystem vorhandenes instance_conf verwenden
---

diff --git a/SL/Controller/CustomerVendor.pm b/SL/Controller/CustomerVendor.pm
index a8b9c4544..23c903687 100644
--- a/SL/Controller/CustomerVendor.pm
+++ b/SL/Controller/CustomerVendor.pm
@@ -682,8 +682,6 @@ sub _create_customer_vendor {
 sub _pre_render {
   my ($self) = @_;
 
-  $self->{template_args}->{instance_conf} = $::instance_conf;
-
   my $dbh = $::form->get_standard_dbh();
 
   my $query;
diff --git a/templates/webpages/customer_vendor/tabs/billing.html b/templates/webpages/customer_vendor/tabs/billing.html
index 531121177..ace2bd539 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 ( instance_conf.get_vertreter ) %]
+    [% IF ( INSTANCE_CONF.get_vertreter ) %]
       <tr>
         <th align="right">
           [% IF SELF.is_vendor() %]
@@ -292,7 +292,7 @@
     </tr>
 
     <tr>
-      [% IF ( !instance_conf.get_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() && !instance_conf.get_vertreter ) %]
+      [% IF ( SELF.is_customer() && !INSTANCE_CONF.get_vertreter ) %]
         <th align="right">[% 'Salesman' | $T8 %]</th>
 
         <td>