diff options
| author | Mark Wells <mark@freeside.biz> | 2016-06-03 17:45:04 -0700 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2016-06-03 17:45:37 -0700 |
| commit | 7483c5e354bbee171bbb9c6996ae9a56e9517ea6 (patch) | |
| tree | 130ba6f91641f9b1b1541c0b8be14e2a6e8c1d8c | |
| parent | d22baa4e71bfa9e153c1fe1152ff4c748f1d935c (diff) | |
calculate unitrecur on sql_external packages with quantity details, #40558
| -rw-r--r-- | FS/FS/cust_main/Billing.pm | 1 | ||||
| -rw-r--r-- | FS/FS/part_pkg/sql_external.pm | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/FS/FS/cust_main/Billing.pm b/FS/FS/cust_main/Billing.pm index 47a3dc2d4..d95376798 100644 --- a/FS/FS/cust_main/Billing.pm +++ b/FS/FS/cust_main/Billing.pm @@ -1172,6 +1172,7 @@ sub _make_lines { if ( $param{'override_quantity'} ) { $override_quantity = $param{'override_quantity'}; + $unitrecur = $recur / $override_quantity; } if ( $increment_next_bill ) { diff --git a/FS/FS/part_pkg/sql_external.pm b/FS/FS/part_pkg/sql_external.pm index 676063460..9bf107b7d 100644 --- a/FS/FS/part_pkg/sql_external.pm +++ b/FS/FS/part_pkg/sql_external.pm @@ -96,8 +96,7 @@ sub calc_recur { die "sql_external query returned non-numeric amount: $row->{amount}"; } } - if (exists $row->{quantity}) { - $quantity ||= 0; + if (defined $row->{quantity}) { if ( $row->{quantity} eq '' ) { # treat as zero } elsif ( $row->{quantity} =~ /^\d+$/ ) { |