[freeside-commits] branch master updated. 77daf007ef522ae71041d9b094643cf868d8ecce
Ivan Kohler
ivan at freeside.biz
Wed Jan 10 22:46:34 PST 2018
The branch, master has been updated
via 77daf007ef522ae71041d9b094643cf868d8ecce (commit)
via dd43be3233e0411109342c691a47d1b6d6747015 (commit)
via 0c9802e5aeff0c80059db9f14135cf4826bf500b (commit)
via f8f2ef5ae14c08397b1af8986a1cf5831c453e21 (commit)
via 86efecebb509fcabea1f46bdbb15ab9287afc574 (commit)
via 4e0e5fd6d74c3948dd0cb7981e249dc2bf987d66 (commit)
via d0ef2d787f311d78f34f5e068514bad91fe7b37b (commit)
via defbec8798d006a70b13a4b7160742b85d16047d (commit)
from 5136b6e7f17e6d86911f7feb520dd5b4248532bb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 77daf007ef522ae71041d9b094643cf868d8ecce
Merge: dd43be323 5136b6e7f
Author: Ivan Kohler <ivan at freeside.biz>
Date: Wed Jan 10 22:46:31 2018 -0800
Merge branch 'master' of git.freeside.biz:/home/git/freeside
commit dd43be3233e0411109342c691a47d1b6d6747015
Author: Ivan Kohler <ivan at freeside.biz>
Date: Wed Jan 10 22:46:26 2018 -0800
no need for a one-choice "Add new location" location dropdown on prospect add, RT#76000
diff --git a/httemplate/edit/elements/edit.html b/httemplate/edit/elements/edit.html
index 25568745d..2f82f9c99 100644
--- a/httemplate/edit/elements/edit.html
+++ b/httemplate/edit/elements/edit.html
@@ -358,6 +358,7 @@ Example:
% #contact
% 'custnum' => $f->{'custnum'},
% 'prospectnum' => $f->{'prospectnum'},
+%
% );
%
% $include_common{$_} = $f->{$_} foreach grep exists($f->{$_}),
@@ -370,7 +371,7 @@ Example:
% qw( formatted_value ), #fixed
% qw( country ), #select-country
% qw( width height config ), #htmlarea
-% qw( alt_format ), #select-cust_location
+% qw( is_optional alt_format ), #select-cust_location
% qw( classnum ), # select-inventory_item
% qw( aligned ), # columnstart
% qw( debug ), # select-table
commit 0c9802e5aeff0c80059db9f14135cf4826bf500b
Author: Ivan Kohler <ivan at freeside.biz>
Date: Wed Jan 10 16:42:00 2018 -0800
fix direct use of customer_view_emails pref, RT#78617
diff --git a/httemplate/view/cust_main/notes/email.html b/httemplate/view/cust_main/notes/email.html
index 41c5b8ad4..9e217e4f0 100644
--- a/httemplate/view/cust_main/notes/email.html
+++ b/httemplate/view/cust_main/notes/email.html
@@ -61,7 +61,10 @@ my $cust_main = $opt{'cust_main'}
my $custnum = $cust_main->custnum;
my $where = "WHERE cust_msg.custnum = $custnum";
-my $maxrecords = $curuser->option('customer_view_emails') || 10;
+my $maxrecords = 10;
+if ( $curuser->option('customer_view_emails') =~ /^\s*(\d+)\s*$/ ) {
+ $maxrecords = $1;
+}
my $order_by = '_date DESC';
commit f8f2ef5ae14c08397b1af8986a1cf5831c453e21
Author: Ivan Kohler <ivan at freeside.biz>
Date: Wed Jan 10 16:37:13 2018 -0800
extend vitelity integration: start and complete port-in, RT#73618, RT#78929
diff --git a/FS/FS/svc_phone.pm b/FS/FS/svc_phone.pm
index c2250c111..637c148c1 100644
--- a/FS/FS/svc_phone.pm
+++ b/FS/FS/svc_phone.pm
@@ -813,7 +813,7 @@ sub phone_name_or_cust {
}
my $cust_pkg = $self->cust_svc->cust_pkg or return '';
if ( $cust_pkg->contactnum ) {
- return $cust_pkg->contact->firstlast;
+ return $cust_pkg->contact_obj->firstlast;
} else {
return $cust_pkg->cust_main->name_short;
}
commit 86efecebb509fcabea1f46bdbb15ab9287afc574
Author: Ivan Kohler <ivan at freeside.biz>
Date: Thu Jan 4 23:39:06 2018 -0800
doc
diff --git a/FS/bin/freeside-upgrade b/FS/bin/freeside-upgrade
index c5ea9330f..c5df06dc3 100755
--- a/FS/bin/freeside-upgrade
+++ b/FS/bin/freeside-upgrade
@@ -449,8 +449,10 @@ Also performs other upgrade functions:
[ -v ]: Run verbosely, sending debugging information to STDERR. This is the
current default.
- [ -s ]: Schema changes only. Useful for Pg/slony slaves where the data
- changes will be replicated from the Pg/slony master.
+ [ -s ]: Schema changes only. Used to be useful for Pg/slony slaves where the
+ data changes would be replicated from the Pg/slony master (current
+ native Pg replication replicates schema changes to slaves
+ automatically).
[ -r ]: Skip sqlradius updates. Useful for occassions where the sqlradius
databases may be inaccessible.
commit 4e0e5fd6d74c3948dd0cb7981e249dc2bf987d66
Author: Ivan Kohler <ivan at freeside.biz>
Date: Thu Jan 4 17:41:48 2018 -0800
happy new year
diff --git a/README b/README
index 476b58e95..0ddb78aeb 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
Freeside is a billing and administration package for Internet Service
Providers, VoIP providers and other online businesses.
-Copyright (C) 2005-2017 Freeside Internet Services, Inc.
+Copyright (C) 2005-2018 Freeside Internet Services, Inc.
Copyright (C) 2000-2005 Ivan Kohler
Copyright (C) 1999 Silicon Interactive Software Design
Additional copyright holders may be found in the docs/license.html file.
commit d0ef2d787f311d78f34f5e068514bad91fe7b37b
Author: Ivan Kohler <ivan at freeside.biz>
Date: Thu Jan 4 14:46:21 2018 -0800
fix reports for 2018, RT#79090
diff --git a/httemplate/elements/tr-select-from_to.html b/httemplate/elements/tr-select-from_to.html
index 1224de68a..c24209737 100644
--- a/httemplate/elements/tr-select-from_to.html
+++ b/httemplate/elements/tr-select-from_to.html
@@ -39,7 +39,7 @@
my %hash = (
'show_month_abbr' => 1,
'start_year' => '1999',
- 'end_year' => '2017',
+ 'end_year' => $eyear+3,
@_,
);
</%init>
commit defbec8798d006a70b13a4b7160742b85d16047d
Author: Ivan Kohler <ivan at freeside.biz>
Date: Thu Jan 4 14:17:06 2018 -0800
add "bill_only_pkg_dates" option to inbound voip billing, RT#79001
diff --git a/FS/FS/part_pkg/voip_inbound.pm b/FS/FS/part_pkg/voip_inbound.pm
index e9ab1f733..efaf586ab 100644
--- a/FS/FS/part_pkg/voip_inbound.pm
+++ b/FS/FS/part_pkg/voip_inbound.pm
@@ -120,6 +120,10 @@ tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
'type' => 'checkbox',
},
+ 'bill_only_pkg_dates' => { 'name' => 'Only bill CDRs with a date during the package billing period',
+ 'type' => 'checkbox',
+ },
+
#XXX also have option for an external db
# 'cdr_location' => { 'name' => 'CDR database location'
# 'type' => 'select',
@@ -160,6 +164,7 @@ tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
use_duration
output_format usage_mandate summarize_usage usage_section
bill_every_call
+ bill_only_pkg_dates
)
],
'weight' => 42,
@@ -236,12 +241,18 @@ sub calc_usage {
) {
my $svc_phone = $cust_svc->svc_x;
- my $cdr_search = $svc_phone->psearch_cdrs(
+ my %options = (
'inbound' => 1,
'default_prefix' => $self->option('default_prefix'),
'status' => '', # unprocessed only
'for_update' => 1,
);
+ if ( $self->option('bill_only_pkg_dates') ) {
+ $options{'begin'} = $last_bill;
+ $options{'end'} = $$sdate;
+ }
+
+ my $cdr_search = $svc_phone->psearch_cdrs(%options);
$cdr_search->limit(1000);
$cdr_search->increment(0);
while ( my $cdr = $cdr_search->fetch ) {
-----------------------------------------------------------------------
Summary of changes:
FS/FS/part_pkg/voip_inbound.pm | 13 ++++++++++++-
FS/FS/svc_phone.pm | 2 +-
FS/bin/freeside-upgrade | 6 ++++--
README | 2 +-
httemplate/edit/elements/edit.html | 3 ++-
httemplate/elements/tr-select-from_to.html | 2 +-
httemplate/view/cust_main/notes/email.html | 5 ++++-
7 files changed, 25 insertions(+), 8 deletions(-)
More information about the freeside-commits
mailing list