X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fgraph%2Freport_cust_bill_pkg.html;h=f2c486cf400abbf507a9106771443e3f6e18118b;hb=3a3a22ab974d5c23dc48c397a31ffc00c6d18a2e;hp=664aab74e78d3407703e997b83195ebe286fed64;hpb=c8cccb4a92adceb943c635fe62dad0d034462ce0;p=freeside.git

diff --git a/httemplate/graph/report_cust_bill_pkg.html b/httemplate/graph/report_cust_bill_pkg.html
index 664aab74e..f2c486cf4 100644
--- a/httemplate/graph/report_cust_bill_pkg.html
+++ b/httemplate/graph/report_cust_bill_pkg.html
@@ -6,10 +6,24 @@
 
 <% include('/elements/tr-select-from_to.html' ) %>
 
-<% include('/elements/tr-select-agent.html', 'label' => 'For agent: ' ) %>
+<TR>
+  <TD ALIGN="right">Project to:</TD>
+  <TD><& /elements/select-month_year.html, 
+    prefix => 'project',
+    show_month_abbr => 1 &></TD>
+</TR>
+
+<% include('/elements/tr-select-agent.html',
+             'label'         => 'For agent: ',
+             'disable_empty' => 0,
+             'pre_options'   => [ 'all' => 'all (aggregate)' ],
+             'empty_label'   => 'all (breakdown)',
+          )
+%>
 
-<% include('/elements/tr-select-pkg_class.html', '',
-              'pre_options' => [ '0' => 'all' ],
+<% include('/elements/tr-select-pkg_class.html',
+              'pre_options' => [ 'all'  => 'all (aggregate)',
+                                 '0' => 'all (breakdown)' ],
               'empty_label' => '(empty class)',
            )
 %>
@@ -21,9 +35,39 @@
 </TR>
 -->
 
+% foreach ( qw(Setup Usage) ) {
+<& /elements/tr-select.html,
+    'label'   => "$_ fees",
+    'field'   => 'use_'.lc($_),
+    'options' => [ 0, 1, 2 ],
+    'labels'  => { 0 => 'Combine', 1 => 'Separate', 2 => 'Do not show' },
+&>
+% }
+
+<TR>
+  <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="use_override" VALUE="1"></TD>
+  <TD>Separate sub-packages from parents</TD>
+</TR>
+
+<TR>
+  <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="average_per_cust_pkg" VALUE="1"></TD>
+  <TD>Average per customer package</TD>
+</TR>
+
+<TR>
+  <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="distribute" VALUE="1"></TD>
+  <TD>Distribute recurring fees over billing period</TD>
+</TR>
+
 </TABLE>
 
 <BR><INPUT TYPE="submit" VALUE="Display">
 </FORM>
 
 <% include('/elements/footer.html') %>
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Financial reports');
+
+</%init>