RT#71009: (v4+) OFM - Separate permissions for edit dates and contract dates [tweaked...

diff --git a/httemplate/misc/change_pkg_date.html b/httemplate/misc/change_pkg_date.html
index 0a23805..642a5b8 100755 (executable)
--- a/httemplate/misc/change_pkg_date.html
+++ b/httemplate/misc/change_pkg_date.html
@@ -17,7 +17,7 @@
     value => 'now',
     curr_value => $when,
   &>
     value => 'now',
     curr_value => $when,
   &>

-  <label for="when_now"><% emt('Now') %></label>
+  <label for="when_now"><% emt($isstart ? 'Now' : 'Never') %></label>

 </LI>
 % if ( $next_bill_date ) {
 <LI>
 </LI>
 % if ( $next_bill_date ) {
 <LI>

diff --git a/httemplate/misc/process/change_pkg_date.html b/httemplate/misc/process/change_pkg_date.html
index 5b1eedf..3084ec5 100755 (executable)
--- a/httemplate/misc/process/change_pkg_date.html
+++ b/httemplate/misc/process/change_pkg_date.html
@@ -38,8 +38,9 @@ my $cust_main = $cust_pkg->cust_main;
 my $error;
 my $date_value;
 if ( $cgi->param('when') eq 'now' ) {
 my $error;
 my $date_value;
 if ( $cgi->param('when') eq 'now' ) {

-  # blank start means start it the next time billing runs
-  $date_value = $isstart ? '' : time;
+  # blank start means start it the next time billing runs ("Now")
+  # blank contract end means it never ends ("Never")
+  $date_value = '';

 } elsif ( $cgi->param('when') eq 'next_bill_date' ) {
   $date_value = $cust_main->next_bill_date;
 } elsif ( $cgi->param('when') eq 'date' ) {
 } elsif ( $cgi->param('when') eq 'next_bill_date' ) {
   $date_value = $cust_main->next_bill_date;
 } elsif ( $cgi->param('when') eq 'date' ) {