projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
separate edit and delete rights for customer notes, RT#76001
[freeside.git]
/
conf
/
quotation_html
diff --git
a/conf/quotation_html
b/conf/quotation_html
index
68d373f
..
44164b6
100644
(file)
--- a/
conf/quotation_html
+++ b/
conf/quotation_html
@@
-14,7
+14,7
@@
.allcaps { text-transform:uppercase }
</STYLE>
.allcaps { text-transform:uppercase }
</STYLE>
-<table class="invoice" bgcolor="#ffffff" WIDTH=625 CELLSPACING=8><tr><td>
+<table class="invoice" bgcolor="#ffffff" WIDTH=625 CELLSPACING=8
STYLE="border:1px solid #000000"
><tr><td>
<table class="invoice_header" width="100%">
<tr>
<table class="invoice_header" width="100%">
<tr>
@@
-129,7
+129,7
@@
$OUT .= $header;
$columncount = scalar(my @array = split /<\/th><th/i, $header);
} else {
$OUT .= $header;
$columncount = scalar(my @array = split /<\/th><th/i, $header);
} else {
- $OUT .= '<th align="center">
' . emt('Ref') . '
</th>'.
+ $OUT .= '<th align="center"></th>'.
'<th align="left">' . emt('Description') . '</th>'.
( $unitprices
? '<th align="left">' . emt('Unit Price') . '</th>'.
'<th align="left">' . emt('Description') . '</th>'.
( $unitprices
? '<th align="left">' . emt('Unit Price') . '</th>'.
@@
-155,7
+155,11
@@
$OUT .= ( ($line->{'ref'} && $line->{'ref'} ne $lastref) ? '' : '_more' ).
'">'.
'<td align="center">'.
$OUT .= ( ($line->{'ref'} && $line->{'ref'} ne $lastref) ? '' : '_more' ).
'">'.
'<td align="center">'.
- ( $line->{'ref'} ne $lastref ? $line->{'ref'} : '' ). '</td>'.
+ ( $line->{'ref'} ne $lastref
+ ? $line->{'preref_html'} #. $line->{'ref'}
+ : ''
+ ).
+ '</td>'.
'<td align="left">'. $line->{'description'}. '</td>'.
( $unitprices
? '<td align="left">'. $line->{'unit_amount'}. '</td>'.
'<td align="left">'. $line->{'description'}. '</td>'.
( $unitprices
? '<td align="left">'. $line->{'unit_amount'}. '</td>'.
@@
-227,8
+231,10
@@
foreach my $line ( @total_items ) {
foreach my $line ( @total_items ) {
+ # in the quotation logic, we specifically tag the total line
+ # instead of using "the second one from the bottom"
$style .= 'border-bottom: 3px solid #000000;'
$style .= 'border-bottom: 3px solid #000000;'
- if
++$linenum == scalar(@total_items) - ( $balance_due_below_line ? 1 : 0 )
;
+ if
$line->{break_after}
;
$OUT .=
'<tr class="invoice_totaldesc">';
$OUT .=
'<tr class="invoice_totaldesc">';