[freeside-commits] branch master updated. 074ab75187e3575674941a72ea50205c2ec42595
Mark Wells
mark at 420.am
Fri Jan 17 16:55:01 PST 2014
The branch, master has been updated
via 074ab75187e3575674941a72ea50205c2ec42595 (commit)
via a292db1a4cf376464f01b5625da8680bcb7928da (commit)
via 8271307cb4cb22192c3f1837ead6073cde1c0963 (commit)
from f16b7061d422461897e2a929fd47e2a7eecbaa64 (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 074ab75187e3575674941a72ea50205c2ec42595
Author: Mark Wells <mark at freeside.biz>
Date: Fri Jan 17 16:48:21 2014 -0800
show add-on package description in sales report, #25836
diff --git a/httemplate/search/cust_bill_pkg.cgi b/httemplate/search/cust_bill_pkg.cgi
index 7476f4d..6b7a5e6 100644
--- a/httemplate/search/cust_bill_pkg.cgi
+++ b/httemplate/search/cust_bill_pkg.cgi
@@ -20,12 +20,10 @@
'fields' => [
@pkgnum,
sub { $_[0]->pkgnum > 0
- # possibly use override.pkg but i think this correct
? $_[0]->get('pkgpart')
: ''
},
sub { $_[0]->pkgnum > 0
- # possibly use override.pkg but i think this correct
? $_[0]->get('pkg')
: $_[0]->get('itemdesc')
},
@@ -246,7 +244,6 @@ if ( $conf->exists('enable_taxclasses') ) {
push @post_desc, 'taxclass';
push @post_desc_null, '';
$post_desc_align .= 'l';
- push @select, 'part_pkg.taxclass'; # or should this use override?
}
# valid in both the tax and non-tax cases
@@ -321,7 +318,8 @@ if ( $use_override ) {
)";
$part_pkg = 'override';
}
-push @select, 'part_pkg.pkgpart', 'part_pkg.pkg'; # or should this use override?
+push @select, "$part_pkg.pkgpart", "$part_pkg.pkg";
+push @select, "$part_pkg.taxclass" if $conf->exists('enable_taxclasses');
# the non-tax case
if ( $cgi->param('nottax') ) {
commit a292db1a4cf376464f01b5625da8680bcb7928da
Author: Mark Wells <mark at freeside.biz>
Date: Fri Jan 17 16:39:28 2014 -0800
fix a snarl in query construction
diff --git a/httemplate/search/cust_bill_pkg.cgi b/httemplate/search/cust_bill_pkg.cgi
index 61093d2..7476f4d 100644
--- a/httemplate/search/cust_bill_pkg.cgi
+++ b/httemplate/search/cust_bill_pkg.cgi
@@ -436,12 +436,12 @@ if ( $cgi->param('nottax') ) {
$join_pkg .= " LEFT JOIN ($exempt_sub) AS item_exempt
USING (billpkgnum)";
- }
- # process tax restrictions
- unshift @tax_where,
- 'cust_bill_pkg_tax_location.taxable_billpkgnum = cust_bill_pkg.billpkgnum',
- 'cust_main_county.tax > 0';
+ # process tax restrictions
+ unshift @tax_where,
+ 'cust_bill_pkg_tax_location.taxable_billpkgnum = cust_bill_pkg.billpkgnum',
+ 'cust_main_county.tax > 0';
+ }
my $tax_sub = "SELECT 1
FROM cust_bill_pkg_tax_location
commit 8271307cb4cb22192c3f1837ead6073cde1c0963
Author: Mark Wells <mark at freeside.biz>
Date: Fri Jan 17 16:11:07 2014 -0800
expand cust_bill_pkg_detail.phonenum field for sum_* formats
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 30a35de..3cb1b77 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -988,7 +988,7 @@ sub tables_hashref {
'format', 'char', 'NULL', 1, '', '',
'classnum', 'int', 'NULL', '', '', '',
'duration', 'int', 'NULL', '', 0, '',
- 'phonenum', 'varchar', 'NULL', 25, '', '',
+ 'phonenum', 'varchar', 'NULL', 255, '', '', # has to hold a service label
'accountcode', 'varchar', 'NULL', 20, '', '',
'startdate', @date_type, '', '',
'regionname', 'varchar', 'NULL', $char_d, '', '',
@@ -1163,7 +1163,7 @@ sub tables_hashref {
'format', 'char', 'NULL', 1, '', '',
'classnum', 'int', 'NULL', '', '', '',
'duration', 'int', 'NULL', '', 0, '',
- 'phonenum', 'varchar', 'NULL', 25, '', '',
+ 'phonenum', 'varchar', 'NULL', 255, '', '',
'accountcode', 'varchar', 'NULL', 20, '', '',
'startdate', @date_type, '', '',
'regionname', 'varchar', 'NULL', $char_d, '', '',
-----------------------------------------------------------------------
Summary of changes:
FS/FS/Schema.pm | 4 ++--
httemplate/search/cust_bill_pkg.cgi | 16 +++++++---------
2 files changed, 9 insertions(+), 11 deletions(-)
More information about the freeside-commits
mailing list