[freeside-commits] branch FREESIDE_3_BRANCH updated. e1a8b2c20bf2d7f69ade1227591a79e0441edbb8

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  e1a8b2c20bf2d7f69ade1227591a79e0441edbb8 (commit)
      from  0369284202cb5f0beeaf8a829ac98db925422e75 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e1a8b2c20bf2d7f69ade1227591a79e0441edbb8
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Apr 15 11:12:38 2015 -0700

    add "All dates" format to package import with contract_end, RT#34397

diff --git a/FS/FS/cust_pkg/Import.pm b/FS/FS/cust_pkg/Import.pm
index f9cf1cb..b806210 100644
--- a/FS/FS/cust_pkg/Import.pm
+++ b/FS/FS/cust_pkg/Import.pm
@@ -103,6 +103,7 @@ sub process_batch_import {
 
 my %formatfields = (
   'default'      => [],
+  'all_dates'    => [],
   'svc_acct'     => [qw( username _password domsvc )],
   'svc_phone'    => [qw( countrycode phonenum sip_password pin )],
   'svc_external' => [qw( id title )],
diff --git a/httemplate/misc/cust_pkg-import.html b/httemplate/misc/cust_pkg-import.html
index 1ec5930..c1c1b8b 100644
--- a/httemplate/misc/cust_pkg-import.html
+++ b/httemplate/misc/cust_pkg-import.html
@@ -29,8 +29,8 @@ Import a file containing customer packages.
       <SELECT NAME="format">
         <OPTION VALUE="default" SELECTED>Default
         <OPTION VALUE="default-agent_custid">Default with agent_custid
-        <OPTION VALUE="all_dates" SELECTED>All dates
-        <OPTION VALUE="all_dates-agent_custid" SELECTED>All dates with agent_custid
+        <OPTION VALUE="all_dates">All dates
+        <OPTION VALUE="all_dates-agent_custid">All dates with agent_custid
         <OPTION VALUE="svc_acct">Account service
         <OPTION VALUE="svc_acct-agent_custid">Account service with agent_custid
         <OPTION VALUE="svc_phone">Phone service
@@ -77,6 +77,7 @@ Uploaded files can be CSV (comma-separated value) files or Excel spreadsheets.
 <BR><BR>
 
 <b>All dates with agent_custid</b> format has the following field order: <i>agent_custid<%$req%>, pkgpart<%$req%>, discountnum, order_date, start_date, setup, bill, last_bill, susp, adjourn, resume, cancel, expire, contract_end, dundate</i>
+<BR><BR>
 
 <b>Account service</b> format has the following field order: <i>custnum<%$req%>, pkgpart<%$req%>, discountnum, start_date, setup, bill, last_bill, susp, adjourn, cancel, expire, username, _password, domsvc</i>
 <BR><BR>

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cust_pkg/Import.pm             |    1 +
 httemplate/misc/cust_pkg-import.html |    5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)