projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
FS
/
FS
/
part_event
/
Action
/
Mixin
/
credit_pkg.pm
diff --git
a/FS/FS/part_event/Action/Mixin/credit_pkg.pm
b/FS/FS/part_event/Action/Mixin/credit_pkg.pm
index
a3c1d6e
..
e586f85
100644
(file)
--- a/
FS/FS/part_event/Action/Mixin/credit_pkg.pm
+++ b/
FS/FS/part_event/Action/Mixin/credit_pkg.pm
@@
-21,8
+21,8
@@
sub option_fields {
'type' => 'select',
#add additional ways to specify in the package def
'options' => [qw(
'type' => 'select',
#add additional ways to specify in the package def
'options' => [qw(
- base_recur_permonth cust_bill_pkg_recur recur_cost_permonth
- unit_setup setup_cost
+ base_recur_permonth cust_bill_pkg_recur recur_cost_permonth
recur_margin_permonth
+ unit_setup setup_cost
setup_margin
)],
'labels' => {
'base_recur_permonth' => 'Base monthly fee',
)],
'labels' => {
'base_recur_permonth' => 'Base monthly fee',
@@
-31,6
+31,8
@@
sub option_fields {
'recur_cost_permonth' => 'Monthly cost',
'unit_setup' => 'Setup fee',
'setup_cost' => 'Setup cost',
'recur_cost_permonth' => 'Monthly cost',
'unit_setup' => 'Setup fee',
'setup_cost' => 'Setup cost',
+ 'setup_margin' => 'Setup margin (fee minus cost)',
+ 'recur_margin_permonth' => 'Monthly margin (fee minus cost)',
},
},
);
},
},
);