X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fprospect_main.html;h=eb3e4d6d36785b55e3c5bc90b5806f82e9817c96;hb=37314c736907de968d3f61dd5dc93aa61c6ca161;hp=c260eb8e2c6d06098a2ec171fbf109150006d4a6;hpb=1888d732dcc9f50b7f88ebc684d1c05b534cbd92;p=freeside.git

diff --git a/httemplate/edit/prospect_main.html b/httemplate/edit/prospect_main.html
index c260eb8e2..eb3e4d6d3 100644
--- a/httemplate/edit/prospect_main.html
+++ b/httemplate/edit/prospect_main.html
@@ -19,12 +19,6 @@
        { 'field'             => 'contactnum',
          'type'              => 'contact',
          'colspan'           => 6,
-         ##actually o2m, but this seems to be working for edit so far
-         #'m2name_table'      => 'contact',
-         #'m2name_namecol'    => 'contactnum',
-         #'m2_label'          => 'Contact',
-         #'m2_error_callback' => $m2_error_callback,
-
          'o2m_table'      => 'contact',
          'm2_label'       => 'Contact',
          'm2_error_callback' => $m2_error_callback,
@@ -33,6 +27,7 @@
        { 'field'       => 'locationnum',
          'type'        => 'select-cust_location',
          'empty_label' => 'No address',
+         'alt_format'  => $conf->exists('prospect_main-alt_address_format'),
        },
      ],
      'new_callback'    => $new_callback,
@@ -44,6 +39,7 @@
 <%init>
 
 my $curuser = $FS::CurrentUser::CurrentUser;
+my $conf = new FS::Conf;
 
 my $prospectnum;
 if ( $cgi->param('error') ) {
@@ -139,7 +135,7 @@ my $m2_error_callback = sub {
           my $num = $1;
           if ( grep $cgi->param("contactnum$num$_"), @gfields ) {
             my $x = new FS::contact {
-              'contactnum' => $cgi->param("contactnum$num"),
+              'contactnum' => scalar($cgi->param("contactnum$num")),
               map { $_ => scalar($cgi->param("contactnum${num}_$_")) } @fields,
             };
             $x;