Merge branch 'master' of git.freeside.biz:/home/git/freeside

11 files changed, 14 insertions, 8 deletions

diff --git a/httemplate/edit/contact_class.html b/httemplate/edit/contact_class.html
index 1ab52e5d6..1a1e60d43 100644
--- a/httemplate/edit/contact_class.html
+++ b/httemplate/edit/contact_class.html
@@ -1,5 +1,5 @@
 <% include( 'elements/class_Common.html',
-              'name'   => 'Contact Type',
+              'name_singular'   => 'Contact Type',
               'table'  => 'contact_class',
 	      'nocat' => 1,
               'addl_labels' => { 'classnum'  => 'Type number',
diff --git a/httemplate/edit/cust_class.html b/httemplate/edit/cust_class.html
index 8fce90588..2b074aaa1 100644
--- a/httemplate/edit/cust_class.html
+++ b/httemplate/edit/cust_class.html
@@ -1,5 +1,5 @@
 <% include( 'elements/class_Common.html',
-              'name'        => 'Customer Class',
+              'name_singular'        => 'Customer Class',
               'table'       => 'cust_class',
               'addl_fields' => \@addl_fields,
               'addl_labels' => { 'tax' => 'Tax Exempt' },
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index e3e812f19..2628b4e01 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -315,6 +315,8 @@ if ( $cgi->param('error') ) {
   $stateid = '';
   $payinfo = '';
 
+  $cgi->param('tagnum', FS::part_tag->default_tags);
+
   if ( $cgi->param('qualnum') =~ /^(\d+)$/ ) {
     my $qualnum = $1;
     my $qual = qsearchs('qual', { 'qualnum' => $qualnum } )
diff --git a/httemplate/edit/cust_note_class.html b/httemplate/edit/cust_note_class.html
index 111190b71..a7e47397e 100644
--- a/httemplate/edit/cust_note_class.html
+++ b/httemplate/edit/cust_note_class.html
@@ -1,5 +1,5 @@
 <% include( 'elements/class_Common.html',
-              'name'   => 'Customer Note Class',
+              'name_singular'   => 'Customer Note Class',
               'table'  => 'cust_note_class',
 	      'nocat' => 1,
           )
diff --git a/httemplate/edit/hardware_class.html b/httemplate/edit/hardware_class.html
index 8760dd86c..26f487dda 100644
--- a/httemplate/edit/hardware_class.html
+++ b/httemplate/edit/hardware_class.html
@@ -1,5 +1,5 @@
 <% include( 'elements/edit.html',
-                 'name'   => 'Hardware Class',
+                 'name_singular'   => 'Hardware Class',
                  'table'  => 'hardware_class',
                  'labels' => { 
                                'classnum'  => 'Class number',
diff --git a/httemplate/edit/inventory_class.html b/httemplate/edit/inventory_class.html
index 3ab47fe28..ddde55799 100644
--- a/httemplate/edit/inventory_class.html
+++ b/httemplate/edit/inventory_class.html
@@ -1,5 +1,5 @@
 <% include( 'elements/edit.html',
-                 'name'   => 'Inventory Class',
+                 'name_singular'   => 'Inventory Class',
                  'table'  => 'inventory_class',
                  'labels' => { 
                                'classnum'  => 'Class number',
diff --git a/httemplate/edit/part_svc_class.html b/httemplate/edit/part_svc_class.html
index 0d9a00727..7832bd441 100644
--- a/httemplate/edit/part_svc_class.html
+++ b/httemplate/edit/part_svc_class.html
@@ -1,5 +1,5 @@
 <% include( 'elements/class_Common.html',
-              'name'   => 'Service class',
+              'name_singular'   => 'Service class',
               'table'  => 'part_svc_class',
 	      'nocat' => 1,
           )
diff --git a/httemplate/edit/part_tag.html b/httemplate/edit/part_tag.html
index 2caeb27a0..5712560c1 100644
--- a/httemplate/edit/part_tag.html
+++ b/httemplate/edit/part_tag.html
@@ -5,12 +5,14 @@
                 { field=>'tagname',  type=>'text', size=>10 },
                 { field=>'disabled', type=>'checkbox', value=>'Y' },
                 { field=>'tagdesc',  type=>'text', size=>60 },
+                { field=>'by_default',  type=>'checkbox', value=>'Y' },
                 $tagcolor,
               ],
               'labels'        => { 'tagnum'   => 'Tag #',
                                    'tagname'  => 'Tag',
                                    'tagdesc'  => 'Message',
                                    'tagcolor' => 'Highlight Color',
+                                   'by_default' => 'On by default',
                                    'disabled' => 'Disabled',
                                  },
               'viewall_dir' => 'browse',
diff --git a/httemplate/edit/pkg_class.html b/httemplate/edit/pkg_class.html
index c4e3d8ac5..95c6f3082 100644
--- a/httemplate/edit/pkg_class.html
+++ b/httemplate/edit/pkg_class.html
@@ -1,5 +1,5 @@
 <% include( 'elements/class_Common.html',
-              'name'   => 'Package Class',
+              'name_singular'   => 'Package Class',
               'table'  => 'pkg_class',
               %opt,
           )
diff --git a/httemplate/edit/process/msg_template.html b/httemplate/edit/process/msg_template.html
index b19f5c542..e146adf76 100644
--- a/httemplate/edit/process/msg_template.html
+++ b/httemplate/edit/process/msg_template.html
@@ -29,6 +29,8 @@ sub args_callback {
   # no validation of these; they can contain just about anything
   $content{'subject'} = $cgi->param('subject') || '';
   $content{'body'} = $cgi->param('body') || '';
+  $object->subject('');
+  $object->body('');
   return %content;
 }
 
diff --git a/httemplate/elements/tr-select-cust_tag.html b/httemplate/elements/tr-select-cust_tag.html
index 5312644ef..76b1b715d 100644
--- a/httemplate/elements/tr-select-cust_tag.html
+++ b/httemplate/elements/tr-select-cust_tag.html
@@ -28,7 +28,7 @@ my $cgi = $opt{'cgi'};
 my $is_report = $opt{'is_report'};
 
 my @curr_tagnum = ();
-if ( $cgi && $cgi->param('error') ) {
+if ( $cgi && $cgi->param('tagnum') ) {
   @curr_tagnum = $cgi->param('tagnum');
 } elsif ( $opt{'custnum'} ) {
   @curr_tagnum = map $_->tagnum,