From 3e5bee7db5e58a9938edc3926d55d7e71688ddb2 Mon Sep 17 00:00:00 2001
From: Jonathan Prykop <jonathan@freeside.biz>
Date: Fri, 29 Jul 2016 18:57:14 -0500
Subject: [PATCH] RT#71009: (v4+) OFM - Separate permissions for edit dates and
 contract dates [tweaked now handling]

---
 httemplate/misc/change_pkg_date.html         | 2 +-
 httemplate/misc/process/change_pkg_date.html | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/httemplate/misc/change_pkg_date.html b/httemplate/misc/change_pkg_date.html
index 0a23805f4..642a5b89e 100755
--- a/httemplate/misc/change_pkg_date.html
+++ b/httemplate/misc/change_pkg_date.html
@@ -17,7 +17,7 @@
     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>
diff --git a/httemplate/misc/process/change_pkg_date.html b/httemplate/misc/process/change_pkg_date.html
index 5b1eedfad..3084ec538 100755
--- 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' ) {
-  # 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' ) {
-- 
2.11.0