X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=conf%2Finvoice_html;h=35de6cf09cd1dc213664c761c1539a75967ce664;hb=aa27998a04d946f9e4ae1b4985448208b3f2762d;hp=2073d7ff40b8205401f24f70db832c0c9d0266a5;hpb=b41cc79f66f4e701e0f6d973758529ebff702bf1;p=freeside.git diff --git a/conf/invoice_html b/conf/invoice_html index 2073d7ff4..35de6cf09 100644 --- a/conf/invoice_html +++ b/conf/invoice_html @@ -11,6 +11,7 @@ .invoice_desc_more TD { font-weight: bold; font-size: 10pt } .invoice_extdesc TD { font-size: 8pt } .invoice_totaldesc TD { font-size: 10pt; empty-cells: show } +.allcaps { text-transform:uppercase; font-size: 12pt }
@@ -23,26 +24,26 @@
|
Description | '. - ( $unitprices - ? 'Unit Price | '. - 'Quantity | ' - : '' - ). - 'Amount | '; + $OUT .= '' . emt('Ref') . ' | '. + '' . emt('Description') . ' | '. + ( $unitprices + ? '' . emt('Unit Price') . ' | '. + '' . emt('Quantity') . ' | ' + : '' ). + '' . emt('Amount') . ' | '; } $OUT .= ''; @@ -155,8 +170,8 @@ ( $line->{'ref'} ne $lastref ? $line->{'ref'} : '' ). ''. ''. $line->{'description'}. ' | '. ( $unitprices - ? ''. $line->{'unit_amount'}. ' | '. - ''. $line->{'quantity'}. ' | ' + ? ''. $line->{'unit_amount'}. ' | '. + ''. $line->{'quantity'}. ' | ' : '' ). @@ -188,7 +203,7 @@ } - if ($section->{'description'} || $multisection) { + if ($section->{'description'} || $multisection and !$section->{no_subtotal}) { my $style = 'border-top: 3px solid #000000;'. 'border-bottom: 3px solid #000000;'; $OUT .= @@ -199,7 +214,7 @@ } else { $OUT .= qq(' : '>' ). - $section->{'description'}. ' Total | '. + $section->{'description'}. ' ' . emt('Total') . ''. qq(). $section->{'subtotal'}. ' | '; }
---|