[freeside-commits] branch FREESIDE_3_BRANCH updated. f786ebaff8b6704e4e180428aaaa9afeaea7ecb9
Mark Wells
mark at 420.am
Sun Jul 27 17:46:03 PDT 2014
The branch, FREESIDE_3_BRANCH has been updated
via f786ebaff8b6704e4e180428aaaa9afeaea7ecb9 (commit)
via 0af8be13cbde45885b5b3ed2c2e09a2065ba6e2b (commit)
from d28a76dac2c1b8b20992155cf679ebbcc082de13 (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 f786ebaff8b6704e4e180428aaaa9afeaea7ecb9
Author: Mark Wells <mark at freeside.biz>
Date: Sun Jul 27 17:42:21 2014 -0700
internal doc updates, #30003
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 7cf4c72..4735321 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -570,6 +570,7 @@ sub tables_hashref {
'invoice_terms', 'varchar', 'NULL', $char_d, '', '',
#customer balance info at invoice generation time
+ #(deprecated)
'previous_balance', @money_typen, '', '', #eventually not nullable
'billing_balance', @money_typen, '', '', #eventually not nullable
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index f36ff3b..7f1290f 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -100,23 +100,19 @@ L<Time::Local> and L<Date::Parse> for conversion functions.
=back
-Customer info at invoice generation time
+Deprecated fields
=over 4
-=item billing_balance - the customer's balance at the time the invoice was
-generated (not including charges on this invoice)
+=item billing_balance - the customer's balance immediately before generating
+this invoice. DEPRECATED. Use the L<FS::cust_main/balance_date> method
+to determine the customer's balance at a specific time.
-=item previous_balance - the billing_balance of this customer's previous
-invoice plus the charges on that invoice
+=item previous_balance - the customer's balance immediately after generating
+the invoice before this one. DEPRECATED.
-=back
-
-Deprecated
-
-=over 4
-
-=item printed - deprecated
+=item printed - formerly used to track the number of times an invoice had
+been printed; no longer used.
=back
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index fbf6e75..9a83099 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2839,7 +2839,7 @@ UNIX timestamps; see L<perlfunc/"time">). Also see L<Time::Local> and
L<Date::Parse> for conversion functions. The empty string can be passed
to disable that time constraint completely.
-Available options are:
+Accepts the same options as L<balance_date_sql>:
=over 4
@@ -2847,6 +2847,12 @@ Available options are:
set to true to disregard unapplied credits, payments and refunds outside the specified time period - by default the time period restriction only applies to invoices (useful for reporting, probably a bad idea for event triggering)
+=item cutoff
+
+An absolute cutoff time. Payments, credits, and refunds I<applied> after this
+time will be ignored. Note that START_TIME and END_TIME only limit the date
+range for invoices and I<unapplied> payments, credits, and refunds.
+
=back
=cut
commit 0af8be13cbde45885b5b3ed2c2e09a2065ba6e2b
Author: Mark Wells <mark at freeside.biz>
Date: Sun Jul 27 17:41:41 2014 -0700
improve accuracy of invoice summary page w/ voided payments, #30003
diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index 64f0149..07d2030 100644
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -630,18 +630,6 @@ sub print_generic {
#my $balance_due = $self->owed + $pr_total - $cr_total;
my $balance_due = $self->owed + $pr_total;
- #these are used on the summary page only
-
- # the customer's current balance as shown on the invoice before this one
- $invoice_data{'true_previous_balance'} = sprintf("%.2f", ($self->previous_balance || 0) );
-
- # the change in balance from that invoice to this one
- $invoice_data{'balance_adjustments'} = sprintf("%.2f", ($self->previous_balance || 0) - ($self->billing_balance || 0) );
-
- # the sum of amount owed on all previous invoices
- # ($pr_total is used elsewhere but not as $previous_balance)
- $invoice_data{'previous_balance'} = sprintf("%.2f", $pr_total);
-
# the sum of amount owed on all invoices
# (this is used in the summary & on the payment coupon)
$invoice_data{'balance'} = sprintf("%.2f", $balance_due);
@@ -652,8 +640,67 @@ sub print_generic {
if ( $self->custnum && $self->invnum ) {
- if ( $self->previous_bill ) {
- my $last_bill = $self->previous_bill;
+ my $last_bill = $self->previous_bill;
+ if ( $last_bill ) {
+
+ # "balance_date_range" unfortunately is unsuitable for this, since it
+ # cares about application dates. We want to know the sum of all
+ # _top-level transactions_ dated before the last invoice.
+ my @sql = (
+ 'SELECT SUM(charged) FROM cust_bill WHERE _date <= ? AND custnum = ?',
+ 'SELECT -1*SUM(amount) FROM cust_credit WHERE _date <= ? AND custnum = ?',
+ 'SELECT -1*SUM(paid) FROM cust_pay WHERE _date <= ? AND custnum = ?',
+ 'SELECT SUM(refund) FROM cust_refund WHERE _date <= ? AND custnum = ?',
+ );
+
+ # the customer's current balance immediately after generating the last
+ # bill
+
+ my $last_bill_balance = $last_bill->charged;
+ foreach (@sql) {
+ #warn "$_\n";
+ my $delta = FS::Record->scalar_sql(
+ $_,
+ $last_bill->_date - 1,
+ $self->custnum,
+ );
+ #warn "$delta\n";
+ $last_bill_balance += $delta;
+ }
+
+ warn sprintf("LAST BILL: INVNUM %d, DATE %s, BALANCE %.2f\n\n",
+ $last_bill->invnum,
+ $self->time2str_local('%D', $last_bill->_date),
+ $last_bill_balance
+ ) if $DEBUG > 0;
+ # ("true_previous_balance" is a terrible name, but at least it's no
+ # longer stored in the database)
+ $invoice_data{'true_previous_balance'} = $last_bill_balance;
+
+ # the change in balance from immediately after that invoice
+ # to immediately before this one
+ my $before_this_bill_balance = 0;
+ foreach (@sql) {
+ #warn "$_\n";
+ my $delta = FS::Record->scalar_sql(
+ $_,
+ $self->_date - 1,
+ $self->custnum,
+ );
+ #warn "$delta\n";
+ $before_this_bill_balance += $delta;
+ }
+ $invoice_data{'balance_adjustments'} =
+ sprintf("%.2f", $last_bill_balance - $before_this_bill_balance);
+
+ warn sprintf("BALANCE ADJUSTMENTS: %.2f\n\n",
+ $invoice_data{'balance_adjustments'}
+ ) if $DEBUG > 0;
+
+ # the sum of amount owed on all previous invoices
+ # ($pr_total is used elsewhere but not as $previous_balance)
+ $invoice_data{'previous_balance'} = sprintf("%.2f", $pr_total);
+
$invoice_data{'last_bill'} = {
'_date' => $last_bill->_date, #unformatted
};
@@ -690,9 +737,15 @@ sub print_generic {
}
$invoice_data{'previous_payments'} = \@payments;
$invoice_data{'previous_credits'} = \@credits;
+ } else {
+ # there is no $last_bill
+ $invoice_data{'true_previous_balance'} =
+ $invoice_data{'balance_adjustments'} =
+ $invoice_data{'previous_balance'} = '0.00';
+ $invoice_data{'previous_payments'} = [];
+ $invoice_data{'previous_credits'} = [];
}
-
- }
+ } # if this is an invoice
my $summarypage = '';
if ( $conf->exists('invoice_usesummary', $agentnum) ) {
-----------------------------------------------------------------------
Summary of changes:
FS/FS/Schema.pm | 1 +
FS/FS/Template_Mixin.pm | 85 ++++++++++++++++++++++++++++++++++++++---------
FS/FS/cust_bill.pm | 20 +++++------
FS/FS/cust_main.pm | 8 ++++-
4 files changed, 85 insertions(+), 29 deletions(-)
More information about the freeside-commits
mailing list