show prorate details on invoice, #16010

[freeside.git] / FS / FS / part_pkg / prorate.pm

diff --git a/FS/FS/part_pkg/prorate.pm b/FS/FS/part_pkg/prorate.pm
index 31fee85..f930d41 100644 (file)
--- a/FS/FS/part_pkg/prorate.pm
+++ b/FS/FS/part_pkg/prorate.pm
@@ -24,23 +24,32 @@ use FS::part_pkg::flat;
                           'type' => 'checkbox',
                         },
     'prorate_round_day'=> {
-                          'name' => 'When prorating first month, round to '.
-                                    'the nearest full day',
+                          'name' => 'Round the prorated period to the nearest '.
+                                    'full day',
                           'type' => 'checkbox',
                         },
     'prorate_defer_bill'=> {
                         'name' => 'Defer the first bill until the billing day',
                         'type' => 'checkbox',
                         },
+    'prorate_verbose' => {
+                        'name' => 'Show prorate details on the invoice',
+                        'type' => 'checkbox',
+                        },
   },
-  'fieldorder' => [ 'cutoff_day', 'prorate_defer_bill', 'add_full_period', 'prorate_round_day' ],
+  'fieldorder' => [ 'cutoff_day', 'prorate_defer_bill', 'add_full_period', 'prorate_round_day', 'prorate_verbose' ],
   'freq' => 'm',
   'weight' => 20,
 );
 
 sub calc_recur {
   my $self = shift;
-  return $self->calc_prorate(@_) - $self->calc_discount(@_);
+  return $self->calc_prorate(@_, $self->cutoff_day) - $self->calc_discount(@_);
+}
+
+sub cutoff_day {
+  my $self = shift;
+  $self->option('cutoff_day', 1) || 1;
 }
 
 1;