This commit was manufactured by cvs2svn to create tag 'freeside_1_4_2'.freeside_1_4_2

1 files changed, 13 insertions, 11 deletions

diff --git a/FS/FS/part_bill_event.pm b/FS/FS/part_bill_event.pm
index 28cf62037..2638328ea 100644
--- a/FS/FS/part_bill_event.pm
+++ b/FS/FS/part_bill_event.pm
@@ -149,20 +149,22 @@ sub check {
     || $self->ut_textn('plan')
     || $self->ut_anything('plandata')
   ;
-    #|| $self->ut_snumber('seconds')
   return $error if $error;
 
   #quelle kludge
-  if ( $self->plandata =~ /^(agent_)?templatename\s+(.*)$/m ) {
-    my $name= $2;
-
-    foreach my $file (qw( template latex latexnotes )) {
-      unless ( $conf->exists("invoice_${file}_$name") ) {
-        $conf->set(
-          "invoice_${file}_$name" =>
-            join("\n", $conf->config("invoice_$file") )
-        );
-      }
+  if ( $self->plandata =~ /^templatename\s+(.*)$/ ) {
+    my $name= $1;
+    unless ( $conf->exists("invoice_template_$name") ) {
+      $conf->set(
+        "invoice_template_$name" =>
+          join("\n", $conf->config('invoice_template') )
+      );
+    }
+    unless ( $conf->exists("invoice_latex_$name") ) {
+      $conf->set(
+        "invoice_latex_$name" =>
+          join("\n", $conf->config('invoice_latex') )
+      );
     }
   }