X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fprocess%2Fpart_pkg.cgi;h=db4fcb921d8c349bc990bf4b3fb62996a8fe65d9;hb=116ae6107240a49c854de2662678abb4fbb8acab;hp=72488019010ab7e5ece0f1b267381e2e25c6fc02;hpb=ff92fba056c2b61753d464c84ecede6ec2f57258;p=freeside.git

diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index 724880190..db4fcb921 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -10,6 +10,7 @@
               'precheck_callback' => $precheck_callback,
               'args_callback'     => $args_callback,
               'process_m2m'       => \@process_m2m,
+              'process_o2m'       => \@process_o2m,
           )
 %>
 <%init>
@@ -109,19 +110,38 @@ my $args_callback = sub {
   }
 
   $options{$_} = scalar( $cgi->param($_) )
-    for (qw( setup_fee recur_fee ));
+    for (qw( setup_fee recur_fee disable_line_item_date_ranges ));
   
   push @args, 'options' => \%options;
 
   ###
+  #part_pkg_currency
+  ###
+
+  my %part_pkg_currency = (
+    map { $_ => scalar($cgi->param($_)) }
+      #grep /._[A-Z]{3}$/, #support other options
+      grep /^(setup|recur)_fee_[A-Z]{3}$/,
+        $cgi->param
+  );
+
+  push @args, 'part_pkg_currency' => \%part_pkg_currency;
+
+  ###
   #pkg_svc
   ###
 
   my @svcparts = map { $_->svcpart } qsearch('part_svc', {});
-  my %pkg_svc = map { $_ => scalar($cgi->param("pkg_svc$_")) } @svcparts;
-  my %hidden_svc = map { $_ => scalar($cgi->param("hidden$_")) } @svcparts;
+  my %pkg_svc    = map { $_ => scalar($cgi->param("pkg_svc$_"  )) } @svcparts;
+  my %hidden_svc = map { $_ => scalar($cgi->param("hidden$_"   )) } @svcparts;
+  my %bulk_skip  = map { $_ => ( $cgi->param("no_bulk_skip$_") eq 'Y'
+                                   ? '' : 'Y'
+                               )
+                                                                  } @svcparts;
 
-  push @args, 'pkg_svc' => \%pkg_svc, 'hidden_svc' => \%hidden_svc;
+  push @args, 'pkg_svc'    => \%pkg_svc,
+              'hidden_svc' => \%hidden_svc,
+              'bulk_skip'  => \%bulk_skip;
 
   ###
   # cust_pkg and custnum_ref (inserts only)
@@ -131,6 +151,16 @@ my $args_callback = sub {
                 'custnum_ref' => \$custnum;
   }
 
+  my %part_pkg_vendor;
+  foreach my $param ( $cgi->param ) {
+    if ( $param =~ /^export(\d+)$/ && length($cgi->param($param)) > 0 ) {
+	$part_pkg_vendor{$1} = $cgi->param($param);
+    }
+  }
+  if ( keys %part_pkg_vendor > 0 ) {
+    push @args, 'part_pkg_vendor' => \%part_pkg_vendor;
+  }
+
   #warn "args: ".join('/', @args). "\n";
 
   @args;
@@ -175,6 +205,15 @@ my @process_m2m = (
                         grep /^svc_dst_pkgpart/, $cgi->param
                       ],
   },
+  { 'link_table'   => 'part_pkg_link',
+    'target_table' => 'part_pkg',
+    'base_field'   => 'src_pkgpart',
+    'target_field' => 'dst_pkgpart',
+    'hashref'      => { 'link_type' => 'supp', 'hidden' => '' },
+    'params'       => [ map $cgi->param($_),
+                        grep /^supp_dst_pkgpart/, $cgi->param
+                      ],
+  },
   map { 
     my $hidden = $_;
     { 'link_table'   => 'part_pkg_link',
@@ -225,4 +264,11 @@ if ( $cgi->param('pkgpart') || ! $conf->exists('agent_defaultpkg') ) {
   };
 }
 
+my @process_o2m = (
+  {
+    'table'  => 'part_pkg_msgcat',
+    'fields' => [qw( locale pkg )],
+  },
+);
+
 </%init>