[freeside-commits] branch FREESIDE_2_3_BRANCH updated. ac53786ee24160a38b7f32ba2bf7370449c949a5

Ivan ivan at 420.am
Mon Dec 17 13:44:25 PST 2012


The branch, FREESIDE_2_3_BRANCH has been updated
       via  ac53786ee24160a38b7f32ba2bf7370449c949a5 (commit)
       via  60c97517ffb6cf04faa7c2d05959abd7a39e4f7d (commit)
      from  e12d1178ceacb68b0b8bb5fb892fb8829412080e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ac53786ee24160a38b7f32ba2bf7370449c949a5
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Dec 17 13:44:23 2012 -0800

    add line item report, RT#18676

diff --git a/httemplate/search/report_cust_bill_pkg.html b/httemplate/search/report_cust_bill_pkg.html
new file mode 100644
index 0000000..4f6ee78
--- /dev/null
+++ b/httemplate/search/report_cust_bill_pkg.html
@@ -0,0 +1,118 @@
+<& /elements/header.html, mt('Line item report') &>
+
+<FORM ACTION="cust_bill_pkg.cgi" METHOD="GET">
+<!--<INPUT TYPE="hidden" NAME="magic" VALUE="_date">-->
+
+<TABLE BGCOLOR="#cccccc" CELLSPACING=0
+
+<& /elements/tr-select-agent.html,
+     curr_value    => scalar( $cgi->param('agentnum') ),
+     #label         => emt('Line items for agent: '),
+     disable_empty => 0,
+&>
+
+<& /elements/tr-select-cust_main-status.html,
+     label => emt('Customer status'),
+&>
+
+<!-- customer
+<& /elements/tr-select-cust_class.html,
+     'label'        => emt('Class'),
+     'multiple'     => 1,
+     'pre_options'  => [ '' => emt('(none)') ],
+     'all_selected' => 1,
+&>
+-->
+
+<& /elements/tr-input-beginning_ending.html &>
+
+<!-- needs support in cust_bill_pkg.cgi
+<& /elements/tr-input-lessthan_greaterthan.html,
+     label   => emt('Amount'),
+     field   => 'amount',
+&>
+-->
+
+<!-- customer payment method i guess
+  <& /elements/tr-select-payby.html,
+                label   => emt('Payment method:'),
+                payby_type   => 'cust',
+                multiple     => 1,
+                all_selected => 1,
+  &>
+-->
+
+<TR>
+  <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="nottax" VALUE="Y" onClick="nottax_changed(this)" onChange="nottax_change(thid)"></TD>
+  <TD><% mt('Omit taxes') |h %></TD>
+</TD>
+
+<TR>
+  <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="istax" VALUE="Y" onClick="istax_changed(this)" onChange="istax_change(thid)"></TD>
+  <TD><% mt('Taxes only') |h %></TD>
+</TD>
+
+<!--
+<TR>
+  <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="credit" VALUE="Y"></TD>
+  <TD><% mt("Credit (what's this do?)") |h %></TD>
+</TD>
+-->
+
+</TABLE>
+
+<SCRIPT TYPE="text/javascript">
+  function nottax_changed (what) {
+    if (what.checked && what.form.istax.checked) {
+      what.form.istax.checked = false;
+    }
+  }
+  function istax_changed (what) {
+    if (what.checked && what.form.nottax.checked) {
+      what.form.nottax.checked = false;
+    }
+  }
+</SCRIPT>
+
+<BR>
+<INPUT TYPE="submit" VALUE="<% mt('Get Report') |h %>">
+
+</FORM>
+
+<& /elements/footer.html &>
+<%init>
+
+#Financial reports?
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('List invoices');
+
+my $conf = new FS::Conf;
+
+#other available params (cust_bill_pkg.cgi):
+#
+#distribute = 1
+#
+#(when nottax)
+#  use_override something about part_pkg
+#  classnum package class
+#  taxclass / taxclassNULL
+#  exempt_cust
+#  exempt_pkg
+#  region (country:state:county:city:district)
+#  taxable
+#  out (of taxable region)
+#  usage
+#(when istax)
+#  locationtaxid (& district/city/ciounty/state)
+#  out (of taxable region)
+#  taxclassNULL
+#  report_group (itemdesc)
+#  itemdesc
+#
+#taxname/taxnameNULL cust_main_county
+#taxnum cust_main_county
+#credit (hmm need to look more at what this does)
+
+
+</%init>
+

commit 60c97517ffb6cf04faa7c2d05959abd7a39e4f7d
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Dec 17 13:39:04 2012 -0800

    add line item report, RT#18676

diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index e6fdb57..c112cc5 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -125,6 +125,8 @@ tie my %report_invoices, 'Tie::IxHash',
   'Open invoices' => [ \%report_invoices_open, 'Open invoices' ],
   'All invoices'  => [ $fsurl. 'search/cust_bill.html?date', 'List all invoices' ],
   'Advanced invoice reports' => [ $fsurl.'search/report_cust_bill.html', 'by agent, date range, etc.' ],
+  'separator'     => '',
+  'Line items'    => [ $fsurl. 'search/report_cust_bill_pkg.html', 'Individual line item detail' ],
 ;
 
 tie my %report_discounts, 'Tie::IxHash',

-----------------------------------------------------------------------

Summary of changes:
 httemplate/elements/menu.html               |    2 +
 httemplate/search/report_cust_bill_pkg.html |  118 +++++++++++++++++++++++++++
 2 files changed, 120 insertions(+), 0 deletions(-)
 create mode 100644 httemplate/search/report_cust_bill_pkg.html




More information about the freeside-commits mailing list