time/data/etc. unit pricing add-ons, RT#24392
[freeside.git] / httemplate / edit / part_pkg.cgi
index 2468f30..23de7c1 100755 (executable)
-<% include( 'elements/edit.html',
-              'post_url'    => popurl(1).'process/part_pkg.cgi',
-              'name'        => "Package definition",
-              'table'       => 'part_pkg',
-              #'viewall_dir' => 'browse',
-              'viewall_url' => $p.'browse/part_pkg.cgi',
-              'html_init'   => include('/elements/init_overlib.html').
-                               $freq_changed,
-              'html_bottom' => $html_bottom,
-              'new_hashref_callback' => $new_hashref_callback,
-              'new_object_callback'  => $new_object_callback,
-              'new_callback'         => $new_callback,
-              'edit_callback'        => $edit_callback,
-              'error_callback'       => $error_callback,
-
-              'labels' => { 
-                            'pkgpart'          => 'Package Definition',
-                            'pkg'              => 'Package (customer-visible)',
-                            'comment'          => 'Comment (customer-hidden)',
-                            'classnum'         => 'Package class',
-                            'promo_code'       => 'Promotional code',
-                            'freq'             => 'Recurring fee frequency',
-                            'setuptax'         => 'Setup fee tax exempt',
-                            'recurtax'         => 'Recurring fee tax exempt',
-                            'taxclass'         => 'Tax class',
-                            'plan'             => 'Price plan',
-                            'disabled'         => 'Disable new orders',
-                            'pay_weight'       => 'Payment weight',
-                            'credit_weight'    => 'Credit weight',
-                            'agentnum'         => '',
-                            'setup_fee'        => 'Setup fee',
-                            'recur_fee'        => 'Recurring fee',
-                            'bill_dst_pkgpart' => 'Include line item(s) from package',
-                            'svc_dst_pkgpart'  => 'Include services of package',
-                          },
-
-              'fields' => [
-                            { field=>'clone',  type=>'hidden' },
-                            { field=>'pkgnum', type=>'hidden' },
-
-                            { type => 'columnstart' },
-                            
-                              {field=>'pkg',      type=>'text', size=>40 }, #32
-                              {field=>'comment',  type=>'text', size=>40 }, #32
-                              {field=>'classnum', type=>'select-pkg_class' },
-                              {field=>'disabled', type=>'checkbox', value=>'Y'},
-
-                              { type  => 'tablebreak-tr-title',
-                                value => 'Pricing', #better name?
-                              },
-                              { field => 'plan',
-                                type  => 'selectlayers-select',
-                                options => [ keys %plan_labels ],
-                                labels  => \%plan_labels,
-                              },
-                              { field => 'setup_fee',
-                                type  => 'money',
-                              },
-                              { field    => 'freq',
-                                type     => 'part_pkg_freq',
-                                onchange => 'freq_changed',
-                              },
-                              { field    => 'recur_fee',
-                                type     => 'money',
-                                disabled => sub { $recur_disabled },
-                              },
-                                
-                              #price plan
-                              #setup fee
-                              #recurring frequency
-                              #recurring fee (auto-disable)
-
-                            { type => 'columnnext' },
-
-                              {type=>'justtitle', value=>'Taxation' },
-                              {field=>'setuptax', type=>'checkbox', value=>'Y'},
-                              {field=>'recurtax', type=>'checkbox', value=>'Y'},
-                              {field=>'classnum', type=>'select-taxclass' },
-                              {field=>'taxproductnum', type=>'select-taxproduct' },
-
-                              { type  => 'tablebreak-tr-title',
-                                value => 'Promotions', #better name?
-                              },
-                              { field=>'promo_code', type=>'text', size=>15 },
-
-                              { type  => 'tablebreak-tr-title',
-                                value => 'Line-item revenue recogition', #better name?
-                              },
-                              { field=>'pay_weight',    type=>'text', size=>6 },
-                              { field=>'credit_weight', type=>'text', size=>6 },
-
-                            { type => 'columnnext' },
-
-                              { field=>'agent_type',
-                                type => 'select-agent_types',
-                                curr_value_callback => sub {
-                                  my($cgi, $object, $field) = @_;
-                                  #in the other callbacks..?  hmm.
-                                  \@agent_type;
-                                },
-                              },
-
-                            { type => 'columnend' },
-
-                            { 'type'  => 'tablebreak-tr-title',
-                              'value' => 'Pricing add-ons',
-                            },
-                            { 'field'      => 'bill_dst_pkgpart',
-                              'type'       => 'select-part_pkg',
-                              'm2_label'   => 'Include line item(s) from package',
-                              'm2m_method' => 'bill_part_pkg_link',
-                              'm2m_dstcol' => 'dst_pkgpart',
-                              'm2_error_callback' =>
-                                &{$m2_error_callback_maker}('bill'),
-                            },
-
-                            { type  => 'tablebreak-tr-title',
-                              value => 'Services',
-                            },
-                            { type => 'pkg_svc', },
-
-                            { 'field'      => 'svc_dst_pkgpart',
-                              'label'      => 'Also include services from package: ',
-                              'type'       => 'select-part_pkg',
-                              'm2_label'   => 'Include services of package: ',
-                              'm2m_method' => 'svc_part_pkg_link',
-                              'm2m_dstcol' => 'dst_pkgpart',
-                              'm2_error_callback' =>
-                                &{$m2_error_callback_maker}('svc'),
-                            },
-
-                            { type  => 'tablebreak-tr-title',
-                              value => 'Price plan options',
-                            },
-
-                          ],
-
-           )
-%>
+<& elements/edit.html,
+     'post_url'              => popurl(1).'process/part_pkg.cgi',
+     'name'                  => "Package definition",
+     'table'                 => 'part_pkg',
+
+     'agent_virt'            => 1,
+     'agent_null_right'      => $edit_global,
+     'agent_clone_extra_sql' => $agent_clone_extra_sql,
+     #'viewall_dir'           => 'browse',
+     'viewall_url'           => $p.'browse/part_pkg.cgi',
+     'html_init'             => include('/elements/init_overlib.html').
+                                $javascript,
+     'html_bottom'           => $html_bottom,
+     'body_etc'              =>
+       'onLoad="agent_changed(document.edit_topform.agentnum);
+                aux_planchanged(document.edit_topform.plan);
+                hide_supp_pkgs()"',
+
+     'begin_callback'        => $begin_callback,
+     'end_callback'          => $end_callback,
+     'new_hashref_callback'  => $new_hashref_callback,
+     'new_object_callback'   => $new_object_callback,
+     'new_callback'          => $new_callback,
+     'clone_callback'        => $clone_callback,
+     'edit_callback'         => $edit_callback,
+     'error_callback'        => $error_callback,
+     'field_callback'        => $field_callback,
+
+     'onsubmit'              => 'confirm_submit',
+
+     'labels' => { 
+                   'pkgpart'          => 'Package Definition',
+                   'pkg'              => 'Package',
+                   %locale_field_labels,
+                   'comment'          => 'Comment (customer-hidden)',
+                   'classnum'         => 'Package class',
+                   'addon_classnum'   => 'Restrict additional orders to package class',
+                   'promo_code'       => 'Promotional code',
+                   'freq'             => 'Recurring fee frequency',
+                   'setuptax'         => 'Setup fee tax exempt',
+                   'recurtax'         => 'Recurring fee tax exempt',
+                   'taxclass'         => 'Tax class',
+                   'taxproduct_select'=> 'Tax products',
+                   'plan'             => 'Price plan',
+                   'disabled'         => 'Disable new orders',
+                   'disable_line_item_date_ranges' => 'Disable line item date ranges',
+                   'setup_cost'       => 'Setup cost',
+                   'recur_cost'       => 'Recur cost',
+                   'pay_weight'       => 'Payment weight',
+                   'credit_weight'    => 'Credit weight',
+                   'agentnum'         => 'Agent',
+                   'setup_fee'        => 'Setup fee',
+                   'setup_show_zero'  => 'Show zero setup',
+                   'recur_fee'        => 'Recurring fee',
+                   'recur_show_zero'  => 'Show zero recurring',
+                   ( map { ( "setup_fee_$_" => "Setup fee $_",
+                             "recur_fee_$_" => "Recurring fee $_",
+                           );
+                         }
+                       $conf->config('currencies')
+                   ),
+                   'usagepricepart'   => ' ',
+                   'discountnum'      => 'Offer discounts for longer terms',
+                   'bill_dst_pkgpart' => 'Include line item(s) from package',
+                   'svc_dst_pkgpart'  => 'Include services of package',
+                   'supp_dst_pkgpart' => 'When ordering package, also order',
+                   'report_option'    => 'Report classes',
+                   'fcc_ds0s'         => 'Voice-grade equivalents',
+                   'fcc_voip_class'   => 'Category',
+                   'delay_start'      => 'Default delay (days)',
+                 },
+
+     'fields' => [
+                   { field=>'clone',  type=>'hidden',
+                     curr_value_callback =>
+                       sub { shift->param('clone') },
+                   },
+                   { field=>'pkgnum', type=>'hidden',
+                     curr_value_callback =>
+                       sub { shift->param('pkgnum') },
+                   },
+
+                   { field=>'custom',  type=>'hidden' },
+                   { field=>'family_pkgpart', type=>'hidden' },
+                   { field=>'successor', type=>'hidden' },
+
+                   { type => 'columnstart' },
+                   
+                     { field     => 'pkg',
+                       type      => 'text',
+                       size      => 40, #32
+                       maxlength => 50,
+                     },
+                     #@locale_fields,
+                     {field=>'comment',  type=>'text', size=>40 }, #32
+                     { field         => 'agentnum',
+                       type          => 'select-agent',
+                       disable_empty => ! $acl_edit_global,
+                       empty_label   => '(global)',
+                       onchange      => 'agent_changed',
+                     },
+                     {field=>'classnum', type=>'select-pkg_class' },
+                     ( $conf->exists('pkg-addon_classnum')
+                         ? ( { field=>'addon_classnum',
+                               type =>'select-pkg_class',
+                             }
+                           )
+                          : ()
+                     ),
+                     {field=>'disabled', type=>$disabled_type, value=>'Y'},
+                     {field=>'disable_line_item_date_ranges', type=>$disabled_type, value=>'Y'},
+
+                     { type     => 'tablebreak-tr-title',
+                       value    => 'Pricing', #better name?
+                     },
+                     { field    => 'plan',
+                       type     => 'selectlayers-select',
+                       options  => [ keys %plan_labels ],
+                       labels   => \%plan_labels,
+                       onchange => 'aux_planchanged(what);',
+                     },
+                     { field    => 'setup_fee',
+                       type     => 'money',
+                       onchange => 'setup_changed',
+                     },
+                     { field    => 'setup_show_zero',
+                       type     => 'checkbox',
+                       value    => 'Y',
+                       disabled => sub { $setup_show_zero_disabled },
+                     },
+                     ( map { +{ field => "setup_fee_$_",
+                                type  => 'text',
+                                prefix=> currency_symbol($_, SYM_HTML),
+                                size  => 8,
+                              }
+                           }
+                         sort $conf->config('currencies')
+                     ),
+                     { field    => 'freq',
+                       type     => 'part_pkg_freq',
+                       onchange => 'freq_changed',
+                     },
+                     { field    => 'recur_fee',
+                       type     => 'money',
+                       disabled => sub { $recur_disabled },
+                       onchange => 'recur_changed',
+                     },
+                     { field    => 'recur_show_zero',
+                       type     => 'checkbox',
+                       value    => 'Y',
+                       disabled => sub { $recur_show_zero_disabled },
+                     },
+                     ( map { +{ field => "recur_fee_$_",
+                                type  => 'text',
+                                prefix=> currency_symbol($_, SYM_HTML),
+                                size  => 8,
+                              }
+                           }
+                         sort $conf->config('currencies')
+                     ),
+
+                     #price plan
+                     #setup fee
+                     #recurring frequency
+                     #recurring fee (auto-disable)
+
+                   { type => 'columnnext' },
+
+                     {type=>'justtitle', value=>'Taxation' },
+                     {field=>'setuptax', type=>'checkbox', value=>'Y'},
+                     {field=>'recurtax', type=>'checkbox', value=>'Y'},
+                     {field=>'taxclass', type=>'select-taxclass' },
+                     { field => 'taxproductnums',
+                       type  => 'hidden',
+                       value => join(',', @taxproductnums),
+                     },
+                     { field => 'taxproduct_select',
+                       type  => 'selectlayers',
+                       options => [ '(default)', @taxproductnums ],
+                       curr_value => '(default)',
+                       labels  => { ( '(default)' => '(default)' ),
+                                    map {($_=>$usage_class{$_})}
+                                    @taxproductnums
+                                  },
+                       layer_fields => \%taxproduct_fields,
+                       layer_values_callback => $taxproduct_values,
+                       layers_only  =>   !$taxproducts,
+                       cell_style   => ( !$taxproducts
+                                         ? 'display:none'
+                                         : ''
+                                       ),
+                     },
+
+                     { type  => 'tablebreak-tr-title',
+                       value => 'Promotions', #better name?
+                     },
+                     { field=>'promo_code', type=>'text', size=>15 },
+
+                     { type  => 'tablebreak-tr-title',
+                       value => 'Cost tracking', #better name?
+                     },
+                     { field=>'setup_cost', type=>'money', },
+                     { field=>'recur_cost', type=>'money', },
+
+                     ( $conf->exists('part_pkg-delay_start')
+                       ? ( { type  => 'tablebreak-tr-title',
+                             value => 'Delayed start',
+                           },
+                           { field => 'delay_start',
+                             type => 'text', size => 6 },
+                         )
+                       : ()
+                     ),
+
+                   { type => 'columnnext' },
+
+                     { field    => 'agent_type',
+                       type     => 'select-agent_types',
+                       disabled => ! $acl_edit_global,
+                       curr_value_callback => sub {
+                         my($cgi, $object, $field) = @_;
+                         #in the other callbacks..?  hmm.
+                         \@agent_type;
+                       },
+                     },
+
+                     { type  => 'tablebreak-tr-title',
+                       value => 'Line-item revenue recogition', #better name?
+                     },
+                     { field=>'pay_weight',    type=>'text', size=>6 },
+                     { field=>'credit_weight', type=>'text', size=>6 },
+
+                     ( $conf->exists('cust_pkg-show_fcc_voice_grade_equivalent')
+                       ? ( 
+                           { type  => 'tablebreak-tr-title',
+                             value => 'FCC Form 477 information',
+                           },
+                           { field=>'fcc_voip_class',
+                             type=>'select-voip_class',
+                           },
+                           { field=>'fcc_ds0s', type=>'text', size=>6 },
+                         )
+                        : ()
+                     ),
+
+
+                   { type => 'columnend' },
+
+                   { type     => 'tablebreak-tr-title',
+                     value    => 'Usage pricing add-ons', #better name?  just 'Usage pricing' ?  there's also CDR usage pricing, RADIUS usage pricing, etc :/
+                   },
+                   { 'field'     => 'usagepricepart',
+                     'type'      => 'part_pkg_usageprice',
+                     'o2m_table' => 'part_pkg_usageprice',
+                     'm2_label'  => ' ',
+                     'm2_error_callback' => $usageprice_error_callback,
+                   },
+
+                   { 'type'  => $report_option ? 'tablebreak-tr-title'
+                                               : 'hidden',
+                     'value' => 'Optional report classes',
+                     'field' => 'census_title',
+                   },
+                   { 'field'    => 'report_option',
+                     'type'     => $report_option ? 'select-table'
+                                                  : 'hidden',
+                     'table'    => 'part_pkg_report_option',
+                     'name_col' => 'name',
+                     'hashref'  => { 'disabled' => '' },
+                     'multiple' => 1,
+                   },
+
+                   { 'type'    => 'tablebreak-tr-title',
+                     'value'   => 'Term discounts',
+                   },
+                   { 'field'      => 'discountnum',
+                     'type'       => 'select-table',
+                     'table'      => 'discount',
+                     'name_col'   => 'name',
+                     'hashref'    => { %$discountnum_hashref },
+                     #'extra_sql'  => 'AND (months IS NOT NULL OR months != 0)',
+                     'empty_label'=> 'Select discount',
+                     'm2_label'   => 'Offer discounts for longer terms',
+                     'm2m_method' => 'part_pkg_discount',
+                     'm2m_dstcol' => 'discountnum',
+                     'm2_error_callback' => $discount_error_callback,
+                   },
+
+                   { 'type'    => 'tablebreak-tr-title',
+                     'value'   => 'Pricing add-ons',
+                     'colspan' => 4,
+                   },
+                   { 'field'      => 'bill_dst_pkgpart',
+                     'type'       => 'select-part_pkg',
+                     'extra_sql'  => sub { $pkgpart
+                                            ? "AND pkgpart != $pkgpart"
+                                            : ''
+                                         },
+                     'm2_label'   => 'Include line item(s) from package',
+                     'm2m_method' => 'bill_part_pkg_link',
+                     'm2m_dstcol' => 'dst_pkgpart',
+                     'm2_error_callback' =>
+                       &{$m2_error_callback_maker}('bill'),
+                     'm2_fields' => [ { 'field' => 'hidden',
+                                        'type'  => 'checkbox',
+                                        'value' => 'Y',
+                                        'curr_value' => '',
+                                        'label' => 'Bundle',
+                                      },
+                                    ],
+                   },
+
+                   { type  => 'tablebreak-tr-title',
+                     value => 'Services',
+                   },
+                   { type => 'pkg_svc', },
+
+                   { 'field'      => 'svc_dst_pkgpart',
+                     'label'      => 'Also include services from package: ',
+                     'type'       => 'select-part_pkg',
+                     'extra_sql'  => sub { $pkgpart
+                                            ? "AND pkgpart != $pkgpart"
+                                            : ''
+                                         },
+                     'm2_label'   => 'Include services of package: ',
+                     'm2m_method' => 'svc_part_pkg_link',
+                     'm2m_dstcol' => 'dst_pkgpart',
+                     'm2_error_callback' =>
+                       &{$m2_error_callback_maker}('svc'),
+                   },
+
+                   { 'type'    => 'tablebreak-tr-title',
+                     'value'   => 'Supplemental packages',
+                     'colspan' => '4',
+                     'include_opt_callback' => sub {
+                        'id' => 'show_supp_pkgs',
+                     },
+                   },
+                   { 'field'       => 'supp_dst_pkgpart',
+                     'type'        => 'select-part_pkg',
+                     'm2_label'    => 'When ordering package, also order',
+                     'm2m_method'  => 'supp_part_pkg_link',
+                     'm2m_dstcol'  => 'dst_pkgpart',
+                     'm2_error_callback' =>
+                       &{$m2_error_callback_maker}('supp'),
+                   },
+
+                   { type  => 'tablebreak-tr-title',
+                     value => 'Price plan options',
+                   },
+
+                 ],
+&>
 <%init>
 
 my $curuser = $FS::CurrentUser::CurrentUser;
 
-die "access denied"
-  unless $curuser->access_right('Edit package definitions')
-      || $curuser->access_right('Edit global package definitions')
-      || ( $cgi->param('pkgnum') && $curuser->access_right('Customize customer package') );
+my $edit_global = 'Edit global package definitions';
+my $acl_edit        = $curuser->access_right('Edit package definitions');
+my $acl_edit_global = $curuser->access_right($edit_global);
+
+my $acl_edit_either = $acl_edit || $acl_edit_global;
+
+my $begin_callback = sub {
+  my( $cgi, $fields, $opt ) = @_;
+  die "access denied"
+    unless $acl_edit_either
+        || ( $cgi->param('pkgnum')
+             && $curuser->access_right('Customize customer package')
+           );
+};
+
+my $disabled_type = $acl_edit_either ? 'checkbox' : 'hidden';
+
+#arg.  access rights for cloning are Hard.
+# on the one hand we don't really want cloning (customizing a package) to fail 
+#  for want of finding the source package in normal usage
+# on the other hand, we don't want people using the clone link to be able to
+#  see 
+my $agent_clone_extra_sql = 
+  ' ( '. FS::part_pkg->curuser_pkgs_sql.
+  "   OR ( part_pkg.custom = 'Y' ) ".
+  ' ) ';
+
+my $conf = new FS::Conf;
+my $taxproducts = $conf->exists('enable_taxproducts');
+
+my @locales = grep { ! /^en_/i } $conf->config('available-locales'); #should filter from the default locale lang instead of en_
+my %locale_labels =  map {
+  ( $_ => 'Package -- '. FS::Locales->description($_) )
+} @locales;
+@locales = 
+  sort { $locale_labels{$a} cmp $locale_labels{$b} }
+    @locales;
+
+my $n = 0;
+my %locale_field_labels = (
+  map {
+        ( 'pkgpartmsgnum'. $n++. '_pkg' => $locale_labels{$_} );
+      }
+    @locales
+);
+
+my $sth = dbh->prepare("SELECT COUNT(*) FROM part_pkg_report_option".
+                       "  WHERE disabled IS NULL OR disabled = ''  ")
+  or die dbh->errstr;
+$sth->execute or die $sth->errstr;
+my $report_option = $sth->fetchrow_arrayref->[0];
 
 #XXX
 # - tr-part_pkg_freq: month_increments_only (from price plans)
-# - display add-ons in browse... yeah
-# -QIS- thank goodness
 # - test cloning
+# - test errors cloning
 # - test custom pricing
-#recur_flat->recur_fee migration, ugh
 # - move the selectlayer divs away from lame layer_callback
 
 #my ($query) = $cgi->keywords;
@@ -160,19 +419,76 @@ die "access denied"
 #my $part_pkg = '';
 
 my @agent_type = ();
-my $tax_override;
+my %tax_override = ();
 
-my $clone_part_pkg = '';
+my %taxproductnums = map { ($_->classnum => 1) }
+                     qsearch('usage_class', { 'disabled' => '' });
+my @taxproductnums = ( qw( setup recur ), sort (keys %taxproductnums) );
 
 my %options = ();
 my $recur_disabled = 1;
+my $setup_show_zero_disabled = 0;
+my $recur_show_zero_disabled = 1;
+
+my $pkgpart = '';
+
+my $splice_locale_fields = sub {
+  my( $fields, $pkey_value_callback, $pkg_value_callback ) = @_;
+
+  my $n = 0;
+  my @locale_fields = (
+    map { 
+          my $pkey_value= $pkey_value_callback ? &$pkey_value_callback($_) : '';
+          my $pkg_value = $pkg_value_callback
+                            ? $pkg_value_callback eq 'cgiparam'
+                                ? $cgi->param('pkgpartmsgnum'. $n. '_pkg')
+                                : &$pkg_value_callback($_)
+                            : '';
+          (
+            { field     => 'pkgpartmsgnum'. $n,
+              type      => 'hidden',
+              value     => $pkey_value,
+            },
+            { field     => 'pkgpartmsgnum'. $n. '_locale',
+              type      => 'hidden',
+              value     => $_,
+            },
+            { field     => 'pkgpartmsgnum'. $n++. '_pkg',
+              type      => 'text',
+              size      => 40,
+              #maxlength => 50,
+              value     => $pkg_value,
+            },
+          );
+  
+        }
+      @locales
+  );
+  splice(@$fields, 7, 0, @locale_fields); #XXX 7 is arbitrary above
+
+};
+
 my $error_callback = sub {
-  my($cgi, $object, $fields) = @_;
+  my($cgi, $object, $fields, $opt ) = @_;
+
   (@agent_type) = $cgi->param('agent_type');
-  $tax_override = $cgi->param('tax_override');
-  $clone_part_pkg= qsearchs('part_pkg', { 'pkgpart' => $cgi->param('clone') } );
+
+  $opt->{action} = 'Custom' if $cgi->param('pkgnum');
+
+  $setup_show_zero_disabled = ($cgi->param('setup_fee') > 0) ? 1 : 0;
 
   $recur_disabled = $cgi->param('freq') ? 0 : 1;
+  $recur_show_zero_disabled =
+    $cgi->param('freq')
+      ? $cgi->param('recur_fee') > 0 ? 1 : 0
+      : 1;
+
+  foreach ($cgi->param) {
+    /^usage_taxproductnum_(\d+)$/ && ($taxproductnums{$1} = 1);
+  }
+  $tax_override{''} = $cgi->param('tax_override');
+  $tax_override{$_} = $cgi->param('tax_override_$_')
+    foreach(grep { /^tax_override_(\w+)$/ } $cgi->param);
 
   #some false laziness w/process
   $cgi->param('plan') =~ /^(\w+)$/ or die 'unparsable plan';
@@ -187,9 +503,28 @@ my $error_callback = sub {
         }
         @options;
 
-  #$cgi->param($_, $options{$_}) foreach (qw( setup_fee recur_fee ));
   $object->set($_ => scalar($cgi->param($_)) )
-    foreach (qw( setup_fee recur_fee ));
+    foreach (qw( setup_fee recur_fee disable_line_item_date_ranges ));
+
+  foreach my $currency ( $conf->config('currencies') ) {
+    my %part_pkg_currency = $object->part_pkg_currency_options($currency);
+    foreach (qw( setup_fee recur_fee )) {
+      my $param = $_.'_'.$currency;
+      $object->set( $param, $cgi->param($param) );
+    }
+  }
+
+  $pkgpart = $object->pkgpart;
+
+  &$splice_locale_fields(
+    $fields,
+    sub {
+          my $locale = shift;
+          my $part_pkg_msgcat = $object->part_pkg_msgcat($locale);
+          $part_pkg_msgcat ? $part_pkg_msgcat->pkgpartmsgnum : '';
+        },
+    'cgiparam'
+  );
 
 };
 
@@ -198,44 +533,83 @@ my $new_hashref_callback = sub { { 'plan' => 'flat' }; };
 my $new_object_callback = sub {
   my( $cgi, $hashref, $fields, $opt ) = @_;
 
-  my $part_pkg = '';
-  if ( $cgi->param('clone') ) {
-    $opt->{action} = 'Custom';
-    $clone_part_pkg = qsearchs('part_pkg', { pkgpart=>$cgi->param('clone') } );
-    $part_pkg = $clone_part_pkg->clone;
-    $part_pkg->disabled('Y');
-    %options = $clone_part_pkg->options;
-  } else {
-    $part_pkg = FS::part_pkg->new( $hashref );
-  }
-
+  my $part_pkg = FS::part_pkg->new( $hashref );
   $part_pkg->set($_ => '0')
-    foreach (qw( setup_fee recur_fee ));
+    foreach (qw( setup_fee recur_fee disable_line_item_date_ranges ));
 
   $part_pkg;
 
 };
 
+sub set_report_option {
+  my($cgi, $object, $fields ) = @_; #, $opt
+
+  my @report_option = ();
+  foreach ($object->options) {
+    /^usage_taxproductnum_(\d+)$/ && ($taxproductnums{$1} = 1);
+    /^report_option_(\d+)$/ && (push @report_option, $1);
+  }
+  foreach ($object->part_pkg_taxoverride) {
+    $taxproductnums{$_->usage_class} = 1
+      if $_->usage_class;
+  }
+
+  $cgi->param('report_option', join(',', @report_option));
+  foreach my $field ( @$fields ) {
+    next unless ( 
+      ref($field) eq 'HASH' &&
+      $field->{field} &&
+      $field->{field} eq 'report_option'
+    );
+    #$field->{curr_value} = join(',', @report_option);
+    $field->{value} = join(',', @report_option);
+  }
+
+}
+
 my $edit_callback = sub {
-  my( $cgi, $object, $fields ) = @_;
+  my( $cgi, $object, $fields, $opt ) = @_;
+
+  $setup_show_zero_disabled = ($object->option('setup_fee') > 0) ? 1 : 0;
 
   $recur_disabled = $object->freq ? 0 : 1;
 
-  (@agent_type) = map {$_->typenum} qsearch('type_pkgs',{'pkgpart'=>$1});
-  $tax_override =
-    join (",", map {$_->taxclassnum}
-               qsearch( 'part_pkg_taxoverride', {'pkgpart' => $1} )
-         );
+  $recur_show_zero_disabled =
+    $object->freq
+      ? $object->option('recur_fee') > 0 ? 1 : 0
+      : 1;
 
-#    join (",", map {$_->taxclassnum}
-#               $part_pkg->part_pkg_taxrate( 'cch', $conf->config('defaultloc')
-#         );
-#      unless $tax_override;
+  (@agent_type) =
+    map {$_->typenum} qsearch('type_pkgs', { 'pkgpart' => $object->pkgpart } );
+
+  set_report_option( $cgi, $object, $fields);
 
   %options = $object->options;
 
-  $object->set($_ => $object->option($_))
-    foreach (qw( setup_fee recur_fee ));
+  $object->set($_ => $object->option($_, 1))
+    foreach (qw( setup_fee recur_fee disable_line_item_date_ranges ));
+
+  foreach my $currency ( $conf->config('currencies') ) {
+    my %part_pkg_currency = $object->part_pkg_currency_options($currency);
+    $object->set( $_.'_'.$currency, $part_pkg_currency{$_} )
+      foreach keys %part_pkg_currency;
+  }
+
+  $pkgpart = $object->pkgpart;
+
+  &$splice_locale_fields(
+    $fields,
+    sub {
+          my $locale = shift;
+          my $part_pkg_msgcat = $object->part_pkg_msgcat($locale);
+          $part_pkg_msgcat ? $part_pkg_msgcat->pkgpartmsgnum : '';
+        },
+    sub {
+          my $locale = shift;
+          my $part_pkg_msgcat = $object->part_pkg_msgcat($locale);
+          $part_pkg_msgcat ? $part_pkg_msgcat->pkg : '';
+        }
+  );
 
 };
 
@@ -243,31 +617,133 @@ my $new_callback = sub {
   my( $cgi, $object, $fields ) = @_;
 
   my $conf = new FS::Conf; 
+
   if ( $conf->exists('agent_defaultpkg') ) {
     #my @all_agent_types = map {$_->typenum} qsearch('agent_type',{});
     @agent_type = map {$_->typenum} qsearch('agent_type',{});
   }
 
+  $options{'suspend_bill'}=1 if $conf->exists('part_pkg-default_suspend_bill');
+
+  &$splice_locale_fields($fields, '', '');
+
+};
+
+my $clone_callback = sub {
+  my( $cgi, $object, $fields, $opt ) = @_;
+
+  if ( $cgi->param('pkgnum') ) {
+
+    my $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $cgi->param('pkgnum') } );
+    $object->agentnum( $cust_pkg->cust_main->agentnum );
+
+    $opt->{action} = 'Custom';
+
+    #my $part_pkg = $clone_part_pkg->clone;
+    #this is all clone does anyway
+    $object->custom('Y');
+
+    $object->disabled('Y');
+
+  } else { #when explicitly cloning, not customizing
+
+    (@agent_type) =
+      map {$_->typenum} qsearch('type_pkgs',{ 'pkgpart' => $object->pkgpart } );
+
+  }
+
+  set_report_option( $cgi, $object, $fields);
+
+  %options = $object->options;
+
+  $object->set($_ => $options{$_})
+    foreach (qw( setup_fee recur_fee disable_line_item_date_ranges ));
+
+  foreach my $currency ( $conf->config('currencies') ) {
+    my %part_pkg_currency = $object->part_pkg_currency_options($currency);
+    $object->set( $_.'_'.$currency, $part_pkg_currency{$_} )
+      foreach keys %part_pkg_currency;
+  }
+
+  $recur_disabled = $object->freq ? 0 : 1;
+
+  &$splice_locale_fields(
+    $fields,
+    '',
+    sub {
+      my $locale = shift;
+      my $part_pkg_msgcat = $object->part_pkg_msgcat($locale);
+      $part_pkg_msgcat ? $part_pkg_msgcat->pkg : '';
+    }
+  );
+};
+
+my $discount_error_callback = sub {
+  my( $cgi, $object ) = @_;
+  map {
+        if ( /^discountnum(\d+)$/ &&
+             ( my $discountnum = $cgi->param("discountnum$1") ) )
+        {
+          new FS::part_pkg_discount {
+            'pkgpart'     => $object->pkgpart,
+            'discountnum' => $discountnum,
+          };
+        } else {
+          ();
+        }
+      }
+  $cgi->param;
+};
+
+my $usageprice_error_callback = sub {
+  my( $cgi, $object ) = @_;
+  map {
+        if ( /^usagepricepart(\d+)_price$/
+               && $cgi->param("usagepricepart$1_price") )
+        {
+          new FS::part_pkg_usageprice {
+            'usagepricepart' => $cgi->param("usagepricepart$1"),
+            'pkgpart'        => $object->pkgpart,
+            'price'          => scalar($cgi->param("usagepricepart$1_price")),
+            #'currency
+            'action'         => scalar($cgi->param("usagepricepart$1_action")),
+            'target'         => scalar($cgi->param("usagepricepart$1_target")),
+            'amount'         => scalar($cgi->param("usagepricepart$1_amount")),
+          };
+        } else {
+          ();
+        }
+      }
+  $cgi->param;
 };
 
 my $m2_error_callback_maker = sub {
   my $link_type = shift; #yay closures
   return sub {
     my( $cgi, $object ) = @_;
-      map  {
-             new FS::part_pkg_link {
-               'link_type'   => $link_type,
-               'src_pkgpart' => $object->pkgpart,
-               'dst_pkgpart' => $_,
-             };
-           }
-      grep $_,
-      map  $cgi->param($_),
-      grep /^${link_type}_dst_pkgpart(\d+)$/, $cgi->param;
+    map {
+
+          if ( /^${link_type}_dst_pkgpart(\d+)$/ &&
+               ( my $dst = $cgi->param("${link_type}_dst_pkgpart$1") ) )
+          {
+
+            my $hidden = $cgi->param("${link_type}_dst_pkgpart__hidden$1")
+                         || '';
+            new FS::part_pkg_link {
+              'link_type'   => $link_type,
+              'src_pkgpart' => $object->pkgpart,
+              'dst_pkgpart' => $dst,
+              'hidden'      => $hidden,
+            };
+          } else {
+            ();
+          }
+        }
+    $cgi->param;
   };
 };
 
-my $freq_changed = <<'END';
+my $javascript = <<'END';
   <SCRIPT TYPE="text/javascript">
 
     function freq_changed(what) {
@@ -276,16 +752,135 @@ my $freq_changed = <<'END';
       if ( freq == '0' ) {
         what.form.recur_fee.disabled = true;
         what.form.recur_fee.style.backgroundColor = '#dddddd';
+        what.form.recur_show_zero.disabled = true;
+        //what.form.recur_show_zero.style.backgroundColor= '#dddddd';
       } else {
         what.form.recur_fee.disabled = false;
         what.form.recur_fee.style.backgroundColor = '#ffffff';
+        recur_changed( what.form.recur_fee );
+        //what.form.recur_show_zero.style.backgroundColor= '#ffffff';
       }
 
     }
 
-  </SCRIPT>
+    function setup_changed(what) {
+      var setup = what.value;
+      if ( parseFloat(setup) == 0 ) {
+        what.form.setup_show_zero.disabled = false;
+      } else {
+        what.form.setup_show_zero.disabled = true;
+      }
+    }
+
+    function recur_changed(what) {
+      var recur = what.value;
+      if ( parseFloat(recur) == 0 ) {
+        what.form.recur_show_zero.disabled = false;
+      } else {
+        what.form.recur_show_zero.disabled = true;
+      }
+    }
+
+    function agent_changed(what) {
+
+      var agentnum;
+      if ( what.type == 'select-one' ) {
+        agentnum = what.options[what.selectedIndex].value;
+      } else {
+        agentnum = what.value;
+      }
+
+      if ( agentnum == 0 ) {
+        what.form.agent_type.disabled = false;
+        //what.form.agent_type.style.backgroundColor = '#ffffff';
+        what.form.agent_type.style.visibility = '';
+      } else {
+        what.form.agent_type.disabled = true;
+        //what.form.agent_type.style.backgroundColor = '#dddddd';
+        what.form.agent_type.style.visibility = 'hidden';
+      }
+
+    }
+
+    function aux_planchanged(what) { //?
+
+      var plan = what.options[what.selectedIndex].value;
+
+      var term_table = document.getElementById('TableNumber7') // XXX NOT ROBUST
+      if ( plan == 'flat' || plan == 'prorate' || plan == 'subscription' ) {
+        //term_table.disabled = false;
+        term_table.style.visibility = '';
+      } else {
+        //term_table.disabled = true;
+        term_table.style.visibility = 'hidden';
+      }
+
+      var currency_regex = /^(setup|recur)_fee_[A-Z]{3}$/;
+
+      var form = what.form
+      for ( var i=0; i < form.length; i++ ) {
+        if ( currency_regex.test(form[i].name) ) {
+          if ( plan == 'currency_fixed' ) {
+            form[i].disabled = false;
+          } else {
+            form[i].disabled = true;
+          }
+        }
+      }
+
+    }
+
+    // some magic to make "supplemental packages" less obvious
+    var supp_pkg_rows = [];
+    function show_supp_pkgs_click() {
+      supp_pkg_rows[0].style.display = '';
+      this.onclick = '';
+      this.style.backgroundColor = '';
+      this.style.border = '';
+      this.style.padding = '';
+    }
+
+    function hide_supp_pkgs() {
+      var all_selects = document.getElementsByTagName('select');
+      for (var i=0; i < all_selects.length; i++) {
+        if ( all_selects[i].id.match(/^supp_dst_pkgpart/) ) {
+          supp_pkg_rows.push( all_selects[i].parentNode.parentNode );
+        }
+      }
+      if ( supp_pkg_rows.length == 1 ) {
+        // there are none configured, so hide the row to create a new one
+        supp_pkg_rows[0].style.display = 'none';
+        var button = document.getElementById('show_supp_pkgs');
+        button.onclick = show_supp_pkgs_click;
+        button.style.backgroundColor = '#cccccc';
+        button.style.border = '1px solid #7e0079';
+        button.style.padding = '1px';
+      }
+    }
+
 END
 
+my $warning =
+  'Changing the setup or recurring fee will create a new package definition. '.
+  'Continue?';
+
+$javascript .= "function confirm_submit(f) {";
+if ( $conf->exists('part_pkg-lineage') ) {
+  $javascript .= "
+
+    var fields = Array('setup_fee','recur_fee');
+    for(var i=0; i < fields.length; i++) {
+        if ( f[fields[i]].value != f[fields[i]].defaultValue ) {
+            return confirm('$warning');
+        }
+    }
+";
+}
+$javascript .= "
+  return true;
+}
+</SCRIPT>";
+
 tie my %plans, 'Tie::IxHash', %{ FS::part_pkg::plan_info() };
 
 tie my %plan_labels, 'Tie::IxHash',
@@ -316,7 +911,8 @@ my $html_bottom = sub {
     #  $html .= ' SELECTED' if $freq eq $part_pkg->freq;
     #  $html .= ">$freq{$freq}";
     #}
-    #$html .= '</SELECT></TD></TR>';
+
+   #$html .= '</SELECT></TD></TR>';
   
     my $href = $plans{$layer}->{'fields'};
     my @fields = exists($plans{$layer}->{'fieldorder'})
@@ -325,6 +921,17 @@ my $html_bottom = sub {
   
     foreach my $field ( grep $_ !~ /^(setup|recur)_fee$/, @fields ) {
   
+      if(!exists($href->{$field})) {
+        # shouldn't happen
+        warn "nonexistent part_pkg option: '$field'\n";
+        next;
+      }
+      if ( exists($href->{$field}->{display_if}) ) {
+        my %args = ( 'plan' => $layer ); # anything else?
+        my $display = &{ $href->{$field}->{display_if} }(%args);
+        next if !$display;
+      }
+
       $html .= '<TR><TD ALIGN="right">'. $href->{$field}{'name'}. '</TD><TD>';
   
       my $format = sub { shift };
@@ -355,6 +962,10 @@ my $html_bottom = sub {
         $html .= ' MULTIPLE'
           if $href->{$field}{'type'} eq 'select_multiple';
         $html .= qq! NAME="${layer}__$field">!;
+
+        $html .= '<OPTION VALUE="">'. $href->{$field}{'empty_label'}
+          if exists($href->{$field}{'disable_empty'})
+               && ! $href->{$field}{'disable_empty'};
   
         if ( $href->{$field}{'select_table'} ) {
           foreach my $record (
@@ -421,13 +1032,113 @@ my $html_bottom = sub {
     labels         => \%plan_labels,
     curr_value     => $object->plan,
     layer_callback => $layer_callback,
+    onchange       => 'aux_planchanged(what);',
   );
 
-  include('/elements/selectlayers.html', %selectlayers, 'layers_only'=>1 ).
-  '<SCRIPT TYPE="text/javascript">'.
-    include('/elements/selectlayers.html', %selectlayers, 'js_only'=>1 ).
-  '</SCRIPT>';
+  my $return =
+    include('/elements/selectlayers.html', %selectlayers, 'layers_only'=>1 ).
+    '<SCRIPT TYPE="text/javascript">'.
+      include('/elements/selectlayers.html', %selectlayers, 'js_only'=>1 );
+
+  $return .=
+    "taxproduct_selectchanged(document.getElementById('taxproduct_select'));\n"
+      if $taxproducts;
+
+  $return .= '</SCRIPT>';
+
+  $return;
 
 };
 
+my %usage_class = map { ($_->classnum => $_->classname) }
+                  qsearch('usage_class', {});
+$usage_class{setup} = 'Setup';
+$usage_class{recur} = 'Recurring';
+
+my %taxproduct_fields = ();
+my $end_callback = sub {
+  my( $cgi, $object, $fields, $opt ) = @_;
+
+  @taxproductnums = ( qw( setup recur ), sort (keys %taxproductnums) );
+
+  if ( $object->pkgpart ) {
+    foreach my $usage_class ( '', @taxproductnums ) {
+      $tax_override{$usage_class} =
+        join (",", map $_->taxclassnum,
+                       qsearch( 'part_pkg_taxoverride', {
+                                  'pkgpart'     => $object->pkgpart,
+                                  'usage_class' => $usage_class,
+                              })
+             );
+    }
+  }
+
+  %taxproduct_fields =
+    map { $_ => [ "taxproductnum_$_", 
+                  { type  => 'select-taxproduct',
+                    #label => "$usage_class{$_} tax product",
+                  },
+                  "tax_override_$_", 
+                  { type  => 'select-taxoverride' }
+                ]
+        }
+        @taxproductnums;
+
+  $taxproduct_fields{'(default)'} =
+    [ 'taxproductnum', { type => 'select-taxproduct',
+                         #label => 'Default tax product',
+                       },
+      'tax_override',  { type => 'select-taxoverride' },
+    ];
+};
+
+my $taxproduct_values = sub {
+  my ($cgi, $object, $flags) = @_;
+  my $routine =
+    sub { my $layer = shift;
+          my @fields = @{$taxproduct_fields{$layer}};
+          my @values = ();
+          while( @fields ) {
+            my $field = shift @fields;
+            shift @fields;
+            $field =~ /^taxproductnum_\w+$/ &&
+              push @values, ( $field => $options{"usage_$field"} );
+            $field =~ /^tax_override_(\w+)$/ &&
+              push @values, ( $field => $tax_override{$1} );
+            $field =~ /^taxproductnum$/ &&
+              push @values, ( $field => $object->taxproductnum );
+            $field =~ /^tax_override$/ &&
+              push @values, ( $field => $tax_override{''} );
+          }
+          { (@values) };
+        };
+  
+  my @result = 
+    map { ( $_ => { &{$routine}($_) } ) } ( '(default)', @taxproductnums );
+  return({ @result });
+  
+};
+
+my $field_callback = sub {
+  my ($cgi, $object, $fieldref) = @_;
+
+  my $field = $fieldref->{field};
+  if ($field eq 'taxproductnums') {
+    $fieldref->{value} = join(',', @taxproductnums);
+  } elsif ($field eq 'taxproduct_select') {
+    $fieldref->{options} = [ '(default)', @taxproductnums ];
+    $fieldref->{labels}  = { ( '(default)' => '(default)' ),
+                             map {( $_ => ($usage_class{$_} || $_) )}
+                               @taxproductnums
+                           };
+    $fieldref->{layer_fields} = \%taxproduct_fields;
+    $fieldref->{layer_values_callback} = $taxproduct_values;
+  }
+};
+
+my $discountnum_hashref = {
+                            'disabled' => '',
+                            'months' => { 'op' => '>', 'value' => 1 },
+                          };
+
 </%init>