move part_pkg transactional stuff from web interface to part_pkg.pm, bumps Bug#18...

[freeside.git] / FS / FS / part_bill_event.pm

diff --git a/FS/FS/part_bill_event.pm b/FS/FS/part_bill_event.pm
index dc10be8..28cf620 100644 (file)
--- a/FS/FS/part_bill_event.pm
+++ b/FS/FS/part_bill_event.pm
@@ -124,7 +124,7 @@ sub check {
 
     $c =~ /^\s*\$cust_main\->(suspend|cancel|invoicing_list_addpost|bill|collect)\(\);\s*("";)?\s*$/
 
-      or $c =~ /^\s*\$cust_bill\->(comp|realtime_card|realtime_ach|realtime_card_cybercash|batch_card|send)\(\);\s*$/
+      or $c =~ /^\s*\$cust_bill\->(comp|realtime_(card|ach|lec)|realtime_card_cybercash|batch_card|send)\(\);\s*$/
 
       or $c =~ /^\s*\$cust_bill\->send\(\'\w+\'\);\s*$/
 
@@ -149,16 +149,20 @@ sub check {
     || $self->ut_textn('plan')
     || $self->ut_anything('plandata')
   ;
+    #|| $self->ut_snumber('seconds')
   return $error if $error;
 
   #quelle kludge
-  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') )
-      );
+  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") )
+        );
+      }
     }
   }