projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
79c4a2f
)
Billsoft -> Avalara adjustments, checkpoint
author
Mark Wells
<mark@freeside.biz>
Tue, 15 Nov 2016 00:02:31 +0000
(16:02 -0800)
committer
Mark Wells
<mark@freeside.biz>
Tue, 15 Nov 2016 00:02:31 +0000
(16:02 -0800)
FS/FS/TaxEngine/billsoft.pm
patch
|
blob
|
history
httemplate/elements/menu.html
patch
|
blob
|
history
httemplate/elements/standardize_locations.js
patch
|
blob
|
history
httemplate/view/cust_main/billing.html
patch
|
blob
|
history
httemplate/view/cust_main/payment_history/invoice.html
patch
|
blob
|
history
diff --git
a/FS/FS/TaxEngine/billsoft.pm
b/FS/FS/TaxEngine/billsoft.pm
index
d262aa4
..
6bda8db
100644
(file)
--- a/
FS/FS/TaxEngine/billsoft.pm
+++ b/
FS/FS/TaxEngine/billsoft.pm
@@
-105,6
+105,7
@@
sub create_batch {
my %sales;
foreach my $cust_bill_pkg ( $cust_bill->cust_bill_pkg ) {
my %sales;
foreach my $cust_bill_pkg ( $cust_bill->cust_bill_pkg ) {
+$DB::single = 1;
my $cust_pkg = $cust_pkg{$cust_bill_pkg->pkgnum}
||= $cust_bill_pkg->cust_pkg;
my $pkgpart = $cust_bill_pkg->pkgpart_override || $cust_pkg->pkgpart;
my $cust_pkg = $cust_pkg{$cust_bill_pkg->pkgnum}
||= $cust_bill_pkg->cust_pkg;
my $pkgpart = $cust_bill_pkg->pkgpart_override || $cust_pkg->pkgpart;
diff --git
a/httemplate/elements/menu.html
b/httemplate/elements/menu.html
index
c4ea9cd
..
72b586e
100644
(file)
--- a/
httemplate/elements/menu.html
+++ b/
httemplate/elements/menu.html
@@
-503,7
+503,7
@@
tie my %tools_importing, 'Tie::IxHash',
'Phone numbers (DIDs)' => [ $fsurl.'misc/phone_avail-import.html', '' ],
'Call Detail Records (CDRs)' => [ $fsurl.'misc/cdr-import.html', '' ],
;
'Phone numbers (DIDs)' => [ $fsurl.'misc/phone_avail-import.html', '' ],
'Call Detail Records (CDRs)' => [ $fsurl.'misc/cdr-import.html', '' ],
;
-if ( $conf->config('tax_data_vendor')
eq 'cch'
) {
+if ( $conf->config('tax_data_vendor') ) {
if ( $conf->exists('taxdatadirectdownload') ) {
$tools_importing{'Tax rates from vendor site'} =
[ $fsurl.'misc/tax-fetch_and_import.cgi', '' ];
if ( $conf->exists('taxdatadirectdownload') ) {
$tools_importing{'Tax rates from vendor site'} =
[ $fsurl.'misc/tax-fetch_and_import.cgi', '' ];
diff --git
a/httemplate/elements/standardize_locations.js
b/httemplate/elements/standardize_locations.js
index
ecccd90
..
dd68370
100644
(file)
--- a/
httemplate/elements/standardize_locations.js
+++ b/
httemplate/elements/standardize_locations.js
@@
-207,8
+207,8
@@
function post_standardization() {
prefix = 'bill_';
}
prefix = 'bill_';
}
- if ( new String(cf.elements[prefix + 'zip'].value).length < 10 )
- {
+
//
if ( new String(cf.elements[prefix + 'zip'].value).length < 10 )
+
//
{
var country_el = cf.elements[prefix + 'country'];
var country = country_el.options[ country_el.selectedIndex ].value;
var country_el = cf.elements[prefix + 'country'];
var country = country_el.options[ country_el.selectedIndex ].value;
@@
-238,12
+238,12
@@
function post_standardization() {
}
}
- } else {
-
- cf.elements[prefix + 'geocode'].value = '';
- <% $post_geocode %>;
-
- }
+
//
} else {
+//
+
//
cf.elements[prefix + 'geocode'].value = '';
+
//
<% $post_geocode %>;
+//
+
//
}
% } else {
% } else {
diff --git
a/httemplate/view/cust_main/billing.html
b/httemplate/view/cust_main/billing.html
index
8d3925a
..
49dbeae
100644
(file)
--- a/
httemplate/view/cust_main/billing.html
+++ b/
httemplate/view/cust_main/billing.html
@@
-132,13
+132,13
@@
set_display_recurring(<% encode_json({'display_recurring' => [ $cust_main->displ
</TR>
% }
</TR>
% }
-% if ( $conf->config('tax_data_vendor')
eq 'cch'
) {
+% if ( $conf->config('tax_data_vendor') ) {
<TR>
<TH ALIGN="right"><% mt('Tax location') |h %></TH>
% my $tax_location = $conf->exists('tax-ship_address')
% ? $cust_main->ship_location
% : $cust_main->bill_location;
<TR>
<TH ALIGN="right"><% mt('Tax location') |h %></TH>
% my $tax_location = $conf->exists('tax-ship_address')
% ? $cust_main->ship_location
% : $cust_main->bill_location;
- <TD><% $tax_location->geocode
('cch')
%></TD>
+ <TD><% $tax_location->geocode %></TD>
</TR>
% }
<TR>
</TR>
% }
<TR>
diff --git
a/httemplate/view/cust_main/payment_history/invoice.html
b/httemplate/view/cust_main/payment_history/invoice.html
index
3a84b9e
..
7c993d6
100644
(file)
--- a/
httemplate/view/cust_main/payment_history/invoice.html
+++ b/
httemplate/view/cust_main/payment_history/invoice.html
@@
-3,10
+3,12
@@
my( $cust_bill, %opt ) = @_;
my( $cust_bill, %opt ) = @_;
-my $invoice = emt("Invoice #[_1] (Balance [_2])",$cust_bill->display_invnum,$cust_bill->owed);
-
my $under = '';
my $under = '';
-if ( $cust_bill->owed > 0 ) {
+my $invoice;
+if ( $cust_bill->pending ) {
+ $invoice = '<I><FONT SIZE="+1" COLOR="#D05000">' .
+ emt("Pending Invoice #[_1] (Charges of [_2])", $cust_bill->display_invnum, $cust_bill->charged);
+} elsif ( $cust_bill->owed > 0 ) {
$invoice = '<B><FONT SIZE="+1" COLOR="#FF0000">' .
emt("Open Invoice #[_1] (Balance [_2])",$cust_bill->display_invnum,$cust_bill->owed) .
'</FONT></B>';
$invoice = '<B><FONT SIZE="+1" COLOR="#FF0000">' .
emt("Open Invoice #[_1] (Balance [_2])",$cust_bill->display_invnum,$cust_bill->owed) .
'</FONT></B>';
@@
-14,7
+16,9
@@
if ( $cust_bill->owed > 0 ) {
$under .= '<BR>'. emt('Payment promised on [_1]',
time2str($opt{'date_format'}, $cust_bill->promised_date));
}
$under .= '<BR>'. emt('Payment promised on [_1]',
time2str($opt{'date_format'}, $cust_bill->promised_date));
}
-} #if $cust_bill->owed
+} else {
+ $invoice = emt("Invoice #[_1] (Balance [_2])",$cust_bill->display_invnum,$cust_bill->owed);
+}
my $invnum = $cust_bill->invnum;
my $invnum = $cust_bill->invnum;