'extra_sql' =>
' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql( 'null'=>1 ).
' AND '. FS::part_pkg->agent_pkgs_sql( $cust_main->agent ),
+ 'order_by' => 'ORDER BY pkg',
});
-my @return = map { $_->pkgpart => $_->pkg_comment }
- sort { $a->pkg_comment cmp $b->pkg_comment }
- @part_pkg;
+my $conf = new FS::Conf;
+
+my $date_format = $conf->config('date_format') || '%m/%d/%Y';
+
+my $default_start_date = $conf->exists('order_pkg-no_start-date')
+ ? ''
+ : $cust_main->next_bill_date;
+
+my @return = map {
+ my $start_date = $_->delay_start_date
+ || $default_start_date;
+ $start_date = time2str($date_format, $start_date)
+ if $start_date;
+ ( $_->pkgpart,
+ $_->pkg_comment,
+ $_->can_discount,
+ $_->can_start_date,
+ $start_date,
+ )
+ }
+ #sort { $a->pkg_comment cmp $b->pkg_comment }
+ @part_pkg;
</%init>