X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=conf%2Finvoice_html;h=7a43aa6d5327469873f00fa64e1922afb99c40a6;hb=bd73a121f43bea3bf2ea576be109a680827676b9;hp=fde0e159fcc83450adb688b8c7eec55ead8e60a7;hpb=51965252466393f61ec23a93a839b487323cf07c;p=freeside.git diff --git a/conf/invoice_html b/conf/invoice_html index fde0e159f..7a43aa6d5 100644 --- a/conf/invoice_html +++ b/conf/invoice_html @@ -6,6 +6,7 @@ .invoice_longtable table { cellspacing: none } .invoice_longtable TH { border-top: 2px solid #000000; border-bottom: 1px solid #000000; padding-left: none; padding-right: none; font-size: 10pt } .invoice_desc TD { border-top: 2px solid #000000; font-weight: bold; font-size: 10pt } +.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 } @@ -14,26 +15,34 @@
"> | +"> | <%= $returnaddress %> |
|
@@ -52,6 +61,20 @@
)
%>
+ <%= $ship_enable ? (''.
+ join(' ',grep length($_), 'Service Address', + $ship_company, + $ship_address1, + $ship_address2, + "$ship_city, $ship_state $ship_zip", + $ship_country, + ' ', + ' ', + ). + ' | ||||||||||||
' + ) + : '' + %> |
Terms: <%= $terms %> <%= $po_line %> @@ -60,32 +83,112 @@ |
CHARGES -
-
Ref | -Description | -Amount | -
---|
'.
+ ' '. + uc(substr($section->{'pretotal'},0,1)). + ''. uc(substr($section->{'pretotal'},1)). + ''. + ' '. + ' |
';
+ if ($section->{'description'}) {
+ $OUT .=
+ ' '. uc(substr($section->{'description'},0,1)). + ''. uc(substr($section->{'description'},1)). + ''. + ' '; + }else{ + $OUT .= + ' CHARGES'. + ' '; + } + $OUT .= ' |
Ref | '. + 'Description | '. + ( $unitprices + ? 'Unit Price | '. + 'Quantity | ' + : '' + ). + 'Amount | '. + '|
---|---|---|---|---|---|
'. - ' | - '. $ext_desc. ' | '. - ''. + ' | |||
'. + ( $line->{'ref'} ne $lastref ? $line->{'ref'} : '' ). ' | '. + ''. $line->{'description'}. ' | '. + ( $unitprices + ? ''. $line->{'unit_amount'}. ' | '. + ''. $line->{'quantity'}. ' | ' + : '' + ). + + ''. $line->{'amount'}. ' | '. '|
' : '>';
+ $OUT .= '
| |||||
). + qq( | ' : '>' ). + $section->{'description'}. ' Total | '. + qq(). + $section->{'subtotal'}. ' | '. + '|||
';
+ $OUT .=
+ ' '. $section->{'posttotal'}. + ''. + ' '; + $OUT .= ' | |||||
). - qq( | ). + qq( | ' : '>' ). $line->{'total_item'}. ' | '. qq(). $line->{'total_amount'}. ' | '. @@ -114,13 +218,6 @@