projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
calculate unitrecur on sql_external packages with quantity details, #40558
[freeside.git]
/
FS
/
FS
/
cust_main
/
Billing.pm
diff --git
a/FS/FS/cust_main/Billing.pm
b/FS/FS/cust_main/Billing.pm
index
1157ba9
..
d953767
100644
(file)
--- a/
FS/FS/cust_main/Billing.pm
+++ b/
FS/FS/cust_main/Billing.pm
@@
-1067,6
+1067,9
@@
sub _make_lines {
my $recur_billed_currency = '';
my $recur_billed_amount = 0;
my $sdate;
my $recur_billed_currency = '';
my $recur_billed_amount = 0;
my $sdate;
+
+ my $override_quantity;
+
# Conditions for billing the recurring fee:
# - the package doesn't have a future start date
# - and it's not suspended
# Conditions for billing the recurring fee:
# - the package doesn't have a future start date
# - and it's not suspended
@@
-1167,6
+1170,11
@@
sub _make_lines {
$recur_billed_amount = delete $param{'billed_amount'};
}
$recur_billed_amount = delete $param{'billed_amount'};
}
+ if ( $param{'override_quantity'} ) {
+ $override_quantity = $param{'override_quantity'};
+ $unitrecur = $recur / $override_quantity;
+ }
+
if ( $increment_next_bill ) {
my $next_bill;
if ( $increment_next_bill ) {
my $next_bill;
@@
-1241,7
+1249,7
@@
sub _make_lines {
}
}
}
}
- }
+ }
# end of recurring fee
warn "\$setup is undefined" unless defined($setup);
warn "\$recur is undefined" unless defined($recur);
warn "\$setup is undefined" unless defined($setup);
warn "\$recur is undefined" unless defined($recur);
@@
-1305,14
+1313,14
@@
sub _make_lines {
my $cust_bill_pkg = new FS::cust_bill_pkg {
'pkgnum' => $cust_pkg->pkgnum,
'setup' => $setup,
my $cust_bill_pkg = new FS::cust_bill_pkg {
'pkgnum' => $cust_pkg->pkgnum,
'setup' => $setup,
- 'unitsetup' =>
$unitsetup
,
+ 'unitsetup' =>
sprintf('%.2f', $unitsetup)
,
'setup_billed_currency' => $setup_billed_currency,
'setup_billed_amount' => $setup_billed_amount,
'recur' => $recur,
'setup_billed_currency' => $setup_billed_currency,
'setup_billed_amount' => $setup_billed_amount,
'recur' => $recur,
- 'unitrecur' =>
$unitrecur
,
+ 'unitrecur' =>
sprintf('%.2f', $unitrecur)
,
'recur_billed_currency' => $recur_billed_currency,
'recur_billed_amount' => $recur_billed_amount,
'recur_billed_currency' => $recur_billed_currency,
'recur_billed_amount' => $recur_billed_amount,
- 'quantity' => $cust_pkg->quantity,
+ 'quantity' => $
override_quantity || $
cust_pkg->quantity,
'details' => \@details,
'discounts' => [ @setup_discounts, @recur_discounts ],
'hidden' => $part_pkg->hidden,
'details' => \@details,
'discounts' => [ @setup_discounts, @recur_discounts ],
'hidden' => $part_pkg->hidden,