projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove stray </%doc> tag
[freeside.git]
/
FS
/
FS
/
cust_bill.pm
diff --git
a/FS/FS/cust_bill.pm
b/FS/FS/cust_bill.pm
index
c95a005
..
c9b03c0
100644
(file)
--- a/
FS/FS/cust_bill.pm
+++ b/
FS/FS/cust_bill.pm
@@
-2033,10
+2033,13
@@
sub print_csv {
$previous_balance = sprintf('%.2f', $previous_balance);
my $totaldue = sprintf('%.2f', $self->owed + $previous_balance);
my @items = map {
$previous_balance = sprintf('%.2f', $previous_balance);
my $totaldue = sprintf('%.2f', $self->owed + $previous_balance);
my @items = map {
- ($_->{pkgnum} || ''),
- $_->{description},
- $_->{amount}
- } $self->_items_pkg;
+ $_->{pkgnum},
+ $_->{description},
+ $_->{amount}
+ }
+ $self->_items_pkg, #_items_nontax? no sections or anything
+ # with this format
+ $self->_items_tax;
$csv->combine(
$cust_main->agentnum,
$csv->combine(
$cust_main->agentnum,
@@
-2044,6
+2047,7
@@
sub print_csv {
$self->custnum,
$cust_main->first,
$cust_main->last,
$self->custnum,
$cust_main->first,
$cust_main->last,
+ $cust_main->company,
$cust_main->address1,
$cust_main->address2,
$cust_main->city,
$cust_main->address1,
$cust_main->address2,
$cust_main->city,
@@
-2722,6
+2726,7
@@
sub print_generic {
#invoice info
'invnum' => $self->invnum,
#invoice info
'invnum' => $self->invnum,
+ '_date' => $self->_date,
'date' => time2str($date_format, $self->_date),
'today' => time2str($date_format_long, $today),
'terms' => $self->terms,
'date' => time2str($date_format, $self->_date),
'today' => time2str($date_format_long, $today),
'terms' => $self->terms,
@@
-5339,11
+5344,16
@@
sub _items_payments {
#something more elaborate if $_->amount ne ->cust_pay->paid ?
#something more elaborate if $_->amount ne ->cust_pay->paid ?
+ my $desc = $self->mt('Payment received').' '.
+ time2str($date_format,$_->cust_pay->_date );
+ $desc .= $self->mt(' via ' . $_->cust_pay->payby_payinfo_pretty)
+ if ( $self->conf->exists('invoice_payment_details') );
+
push @b, {
push @b, {
- 'description' => $self->mt('Payment received').' '.
- time2str($date_format,$_->cust_pay->_date ),
+ 'description' => $desc,
'amount' => sprintf("%.2f", $_->amount )
};
'amount' => sprintf("%.2f", $_->amount )
};
+
}
@b;
}
@b;