X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fgraph%2Freport_cust_bill_pkg.html;h=4cedcef17bbc22a44a629ec719d2668d0c6e710d;hb=64948ee373a03fa156ebc89cb39adfa6d4d2c3d5;hp=51655a925779648839c516cd1409bfb496a48ef1;hpb=b53214c810513eda313fb7aea5405fb02a3b94c5;p=freeside.git

diff --git a/httemplate/graph/report_cust_bill_pkg.html b/httemplate/graph/report_cust_bill_pkg.html
index 51655a925..4cedcef17 100644
--- a/httemplate/graph/report_cust_bill_pkg.html
+++ b/httemplate/graph/report_cust_bill_pkg.html
@@ -6,14 +6,30 @@
 
 <% include('/elements/tr-select-from_to.html' ) %>
 
+<TR>
+  <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="projection" VALUE="1"></TD>
+  <TD>Show projected data for future months</TD>
+</TR>
+
 <% include('/elements/tr-select-agent.html',
-             'label'         => 'For agent: ',
+             'label'         => 'Agent ',
+             'disable_empty' => 0,
+             'pre_options'   => [ 'all' => 'all (aggregate)' ],
+             'empty_label'   => 'all (breakdown)',
+          )
+%>
+
+<% include('/elements/tr-select-part_referral.html',
+             'label'         => 'Advertising source ',
              'disable_empty' => 0,
+             'pre_options'   => [ 'all' => 'all (aggregate)' ],
+             'empty_label'   => 'all (breakdown)',
           )
 %>
 
 <% include('/elements/tr-select-pkg_class.html',
-              'pre_options' => [ '0' => 'all' ],
+              'pre_options' => [ 'all'  => 'all (aggregate)',
+                                 '0' => 'all (breakdown)' ],
               'empty_label' => '(empty class)',
            )
 %>
@@ -25,16 +41,29 @@
 </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="use_usage" VALUE="1"></TD>
-  <TD>Separate rated usage from recurring fees</TD>
+  <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>