X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fpart_fee.html;h=5f6dc3818c7f4292ff5b235224b08e667a1437d3;hp=e057a752d6f3483784b495096279e495c8e22bf9;hb=11bbf29de447fe39e9d7155fe280a0df70fa8c3c;hpb=e9e0cf0989259b94d9758eceff448666a2e5a5cc

diff --git a/httemplate/edit/part_fee.html b/httemplate/edit/part_fee.html
index e057a752d..5f6dc3818 100644
--- a/httemplate/edit/part_fee.html
+++ b/httemplate/edit/part_fee.html
@@ -22,6 +22,7 @@
     %locale_labels
   },
   'fields'        => \@fields,
+  'viewall_dir'   => 'browse',
   'edit_callback'   => $edit_callback,
   'error_callback'  => $error_callback,
 &>
@@ -34,7 +35,7 @@ die "access denied"
 
 my $conf = FS::Conf->new;
 my @tax_fields;
-if ( $conf->exists('enable_taxproducts') ) {
+if ( $conf->config('tax_data_vendor') ) {
   @tax_fields = (
     { field => 'taxproductnum', type => 'select-taxproduct' }
   );
@@ -42,7 +43,8 @@ if ( $conf->exists('enable_taxproducts') ) {
   @tax_fields = (
     { field => 'taxable', type => 'checkbox', value => 'Y' },
   );
-  push (
+  push @tax_fields,
+  (
     { field => 'taxclass', type => 'select-taxclass' },
   ) if $conf->exists('enable_taxclasses');
 }
@@ -66,10 +68,10 @@ foreach (@locales) {
 $n = 0;
 my %layer_fields = (
   'charged' => [
-    'percent' => { label => 'Fraction of invoice total', type    => 'percentage', },
+    'charged_percent' => { label => 'Fraction of invoice total', type    => 'percentage', },
   ],
   'owed' => [
-    'percent' => { label => 'Fraction of balance', type    => 'percentage', },
+    'owed_percent' => { label => 'Fraction of balance', type    => 'percentage', },
   ],
   'usage' => [
     'usage'   => { type => 'part_fee_usage' }
@@ -105,7 +107,7 @@ my @fields = (
                  'recur'  => 'a recurring charge' },
   },
 
-  { type => 'justtitle', value => 'Fee calculation' },
+  { type => 'tablebreak-tr-title', value => 'Fee calculation' },
   { field   => 'amount',  type    => 'money', },
 
   { field   => 'basis',
@@ -118,8 +120,8 @@ my @fields = (
     layer_values_callback => sub {
       my ($cgi, $obj) = @_;
       {
-        'charged' => { percent => $obj->percent },
-        'owed'    => { percent => $obj->percent },
+        'charged' => { charged_percent => $obj->percent },
+        'owed'    => { owed_percent => $obj->percent },
         'usage'   => { usage => [ $obj->part_fee_usage ] },
       }
     },
@@ -130,7 +132,7 @@ my @fields = (
     type    => 'checkbox',
     value   => 'Y' },
 
-  { type => 'justtitle', value => 'Taxation' },
+  { type => 'tablebreak-tr-title', value => 'Taxation' },
 
   @tax_fields,
 );