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

diff --git a/httemplate/graph/report_cust_bill_pkg.html b/httemplate/graph/report_cust_bill_pkg.html
index 348746514..4cedcef17 100644
--- a/httemplate/graph/report_cust_bill_pkg.html
+++ b/httemplate/graph/report_cust_bill_pkg.html
@@ -6,8 +6,21 @@
 
 <% 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)',
@@ -28,19 +41,28 @@
 </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="average_per_cust_pkg" VALUE="1"></TD>
-  <TD>Average per customer package</TD>
+  <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="distribute" VALUE="1"></TD>
+  <TD>Distribute recurring fees over billing period</TD>
 </TR>
 
 </TABLE>