projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix order_pkg-no_start_date option, RT#25650, fallout from RT#24955, fallout from...
[freeside.git]
/
httemplate
/
misc
/
cust-part_pkg.cgi
diff --git
a/httemplate/misc/cust-part_pkg.cgi
b/httemplate/misc/cust-part_pkg.cgi
index
4662be1
..
f6e91d9
100644
(file)
--- a/
httemplate/misc/cust-part_pkg.cgi
+++ b/
httemplate/misc/cust-part_pkg.cgi
@@
-23,10
+23,17
@@
my @part_pkg = qsearch({
'order_by' => 'ORDER BY pkg',
});
'order_by' => 'ORDER BY pkg',
});
-my $date_format = FS::Conf->new->config('date_format') || '%m/%d/%Y';
+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 @return = map {
- my $start_date = $_->default_start_date($cust_main);
+ my $start_date = $_->delay_start_date
+ || $default_start_date;
$start_date = time2str($date_format, $start_date)
if $start_date;
( $_->pkgpart,
$start_date = time2str($date_format, $start_date)
if $start_date;
( $_->pkgpart,