[freeside-commits] branch master updated. 1b3abef9815111c52b1370ba5168a592ae9cfcb0

[Ivan]

The branch, master has been updated
       via  1b3abef9815111c52b1370ba5168a592ae9cfcb0 (commit)
      from  24d450cf92a14baa588b71e1eb05e80285486a67 (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 1b3abef9815111c52b1370ba5168a592ae9cfcb0
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon May 15 16:18:19 2017 -0700

    no need for a one-choice "Add new location" location dropdown on prospect add, RT#76000

diff --git a/httemplate/elements/select-cust_location.html b/httemplate/elements/select-cust_location.html
index 29563c5..24df352 100644
--- a/httemplate/elements/select-cust_location.html
+++ b/httemplate/elements/select-cust_location.html
@@ -1,3 +1,13 @@
+% my @pre_options  = $opt{pre_options}  ? @{ $opt{pre_options} } : ();
+% if (     ! @pre_options
+%       && ! $cust_main
+%       && ! $opt{is_optional}
+%       && ! @{ $opt{cust_location} }
+%       && $addnew
+% ) {
+    <INPUT NAME="locationnum" ID="locationnum" TYPE="hidden" VALUE="-1">
+% } else {
+
 <SELECT NAME     = "locationnum"
         ID       = "locationnum"
 %     if ( $opt{onchange} ) {
@@ -6,7 +16,6 @@
     >
 
 % #false laziness w/select-table.html
-% my @pre_options  = $opt{pre_options}  ? @{ $opt{pre_options} } : ();
 % while ( @pre_options ) { 
 %   my $pre_opt   = shift(@pre_options);
 %   my $pre_label = shift(@pre_options);
@@ -48,6 +57,7 @@
 % }
 
 </SELECT>
+% }
 <%init>
 
 my $conf = new FS::Conf;

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

Summary of changes:
 httemplate/elements/select-cust_location.html |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)