invoice formatting: add sections for usage, add sections per svc_phone, add folding like line items into one #6592

1 files changed, 20 insertions, 3 deletions

diff --git a/httemplate/browse/usage_class.html b/httemplate/browse/usage_class.html
index 63fd2c5a2..75223e025 100644
--- a/httemplate/browse/usage_class.html
+++ b/httemplate/browse/usage_class.html
@@ -9,9 +9,21 @@
                                     'extra_sql' => 'ORDER BY classnum',
                                   },
                  'count_query' => 'SELECT COUNT(*) FROM usage_class',
-                 'header'      => [ '#', 'Class' ],
-                 'fields'      => [ 'classnum', 'classname' ],
-                 'links'       => [ $link, $link ],
+                 'header'      => [ '#',
+                                    'Class',
+                                    'Weight',
+                                    ( $useformat ? ('Format') : () ),
+                                  ],
+                 'fields'      => [ 'classnum',
+                                    'classname',
+                                    'weight',
+                                    ( $useformat ? (sub { $labels->{shift->format} } ) : () ),
+                                  ],
+                 'links'       => [ $link,
+                                    $link,
+                                    $link,
+                                    ( $useformat ? ( $link ) : () ),
+                                  ],
              )
 %>
 <%init>
@@ -19,6 +31,11 @@
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
+my $conf = new FS::Conf;
+my $useformat = $conf->exists('usage_class_as_a_section');
+my $labels = { &FS::usage_class::summary_formats_labelhash() };
+
+
 my $html_init = 
   'Usage classes define groups of usage for taxation purposes.<BR><BR>'.
   qq!<A HREF="${p}edit/usage_class.html"><I>Add a usage class</I></A><BR><BR>!;