X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fpart_pkg.cgi;h=80a61f813654482616e37c12c9a7167f7b4c0db8;hb=e9a7ae3aadab31f34c6bacb2376f817ecd4d7d8d;hp=9f5510d6501c088ea279fc6e8590be8404098424;hpb=98f6d91ec7eaa907204afbfeb90ede1e3bff656d;p=freeside.git

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 9f5510d65..80a61f813 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -193,7 +193,7 @@
                      { field  => 'change_to_pkgpart',
                        type   => 'select-part_pkg',
                        extra_sql  => sub { $pkgpart
-                        ? "AND pkgpart != $pkgpart"
+                        ? "AND part_pkg.pkgpart != $pkgpart"
                         : ''
                        },
                        empty_label => 'no package',
@@ -297,7 +297,7 @@
                      { field=>'agent_pkgpartid', type=>'text', size=>21 },
 
                      { type  => 'tablebreak-tr-title',
-                       value => 'Line-item revenue recogition', #better name?
+                       value => 'Line-item revenue recognition', #better name?
                      },
                      { field=>'pay_weight',    type=>'text', size=>6 },
                      { field=>'credit_weight', type=>'text', size=>6 },
@@ -351,7 +351,7 @@
                    { 'field'      => 'bill_dst_pkgpart',
                      'type'       => 'select-part_pkg',
                      'extra_sql'  => sub { $pkgpart
-                                            ? "AND pkgpart != $pkgpart"
+                                            ? "AND part_pkg.pkgpart != $pkgpart"
                                             : ''
                                          },
                      'label_callback' => sub { shift->pkg_comment_only },
@@ -378,7 +378,7 @@
                      'label'      => 'Also include services from package: ',
                      'type'       => 'select-part_pkg',
                      'extra_sql'  => sub { $pkgpart
-                                            ? "AND pkgpart != $pkgpart"
+                                            ? "AND part_pkg.pkgpart != $pkgpart"
                                             : ''
                                          },
                      'label_callback' => sub { shift->pkg_comment_only },
@@ -989,9 +989,13 @@ my $html_bottom = sub {
    #$html .= '</SELECT></TD></TR>';
   
     my $href = $plans{$layer}->{'fields'};
-    my @fields = exists($plans{$layer}->{'fieldorder'})
-                   ? @{$plans{$layer}->{'fieldorder'}}
-                   : keys %{ $href };
+    my @fields;
+    if ( $plans{$layer}->{'fieldorder'} ) {
+      @fields = @{ $plans{$layer}->{'fieldorder'} };
+    } else {
+      warn "FS::part_pkg::$layer has no fieldorder.\n";
+      @fields = keys %$href;
+    }
     
     # hash of dependencies for each of the Pricing Plan fields.
     # make sure NOT to use double-quotes inside the 'msg' value.
@@ -1015,7 +1019,7 @@ my $html_bottom = sub {
             }
         }
     };
-    
+
     foreach my $field ( grep $_ !~ /^(setup|recur)_fee$/, @fields ) {
   
       if(!exists($href->{$field})) {
@@ -1029,7 +1033,8 @@ my $html_bottom = sub {
         next if !$display;
       }
 
-      $html .= '<TR><TD ALIGN="right">'. $href->{$field}{'name'}. '</TD><TD>';
+      $html .= '<TR><TD ALIGN="right">'. $href->{$field}{'name'}. '</TD><TD>
+      ';
   
       my $format = sub { shift };
       $format = $href->{$field}{'format'} if exists($href->{$field}{'format'});
@@ -1128,9 +1133,11 @@ my $html_bottom = sub {
       $html .= '</TD></TR>';
     }
     $html .= '</TABLE>';
-  
-    $html .= qq(<INPUT TYPE="hidden" NAME="${layer}__OPTIONS" VALUE=").
-             join(',', keys %{ $href } ). '">';
+ 
+    $html .= include('/elements/hidden.html',
+                field => $layer.'__OPTIONS',
+                value => join(',', @fields)
+             );
   
     $html;