3 files changed, 29 insertions, 2 deletions
diff --git a/httemplate/elements/onload.js b/httemplate/elements/onload.js
new file mode 100644
index 000000000..bfa7eef94
--- /dev/null
+++ b/httemplate/elements/onload.js
@@ -0,0 +1,22 @@
+<%doc>
+Filter component to attach a window.onload handler.
+
+Usage:
+  <script>
+  <&| elements/onload.js &>
+    if ( the_stars_are_right ) {
+      run_this_function();
+    }
+  </&>
+  </script>
+
+</%doc>
+(function() {
+  var tmp = window.onload;
+  window.onload = function() {
+    if (typeof(tmp)== 'function') {
+      tmp();
+    }
+<% $m->content %>
+  };
+})();
diff --git a/httemplate/elements/order_pkg.js b/httemplate/elements/order_pkg.js
index 762b2ddde..4e41fd64a 100644
--- a/httemplate/elements/order_pkg.js
+++ b/httemplate/elements/order_pkg.js
@@ -21,6 +21,11 @@ function pkg_changed () {
       }
     }
 
+// if this form element exists, then the start date is a future
+// package change date; don't replace it
+    if ( form.delay ) {
+      return;
+    }
     form.start_date_text.value = opt.getAttribute('data-start_date');
     if ( opt.getAttribute('data-can_start_date') == 1 ) {
       date_text.style.backgroundColor = '#ffffff';
diff --git a/httemplate/elements/tr-select-cust-part_pkg.html b/httemplate/elements/tr-select-cust-part_pkg.html
index 488f04a13..8431beb4e 100644
--- a/httemplate/elements/tr-select-cust-part_pkg.html
+++ b/httemplate/elements/tr-select-cust-part_pkg.html
@@ -64,9 +64,9 @@
                   );
     }
 
-    window.onload = function() {
+    <&| /elements/onload.js &>
       classnum_changed(document.getElementById('classnum'));
-    }
+    </&>
 
   </SCRIPT>