Index: skin1/modules/QuickBooks/orders_export_qb.tpl diff -u skin1/modules/QuickBooks/orders_export_qb.tpl:1.22.2.3 skin1/modules/QuickBooks/orders_export_qb.tpl:1.22.2.4 --- skin1/modules/QuickBooks/orders_export_qb.tpl:1.22.2.3 Tue Apr 10 15:36:55 2007 +++ skin1/modules/QuickBooks/orders_export_qb.tpl Fri Sep 14 16:27:22 2007 @@ -1,4 +1,4 @@ -{* $Id: orders_export_qb.tpl,v 1.22.2.3 2007/04/10 11:36:55 svowl Exp $ *} +{* $Id: orders_export_qb.tpl,v 1.22.2.4 2007/09/14 12:27:22 ferz Exp $ *} !ACCNT{$delimiter}NAME{$delimiter}ACCNTTYPE{$delimiter}SCD{$delimiter}EXTRA{$delimiter}HIDDEN {* Define account for taxes. Please don't change ACCNTTYPE & EXTRA fields for it! It must be an income account. *} ACCNT{$delimiter}{$config.QuickBooks.acct_tax}{$delimiter}INC{$delimiter}{$delimiter}{$delimiter}N @@ -78,12 +78,12 @@ SPL{$delimiter}INVOICE{$delimiter}{$orders[oid].date|date_format:"%m/%d/%Y"}{$delimiter}{$config.QuickBooks.acct_product}{$delimiter}{$orders[oid].b_lastname}, {$orders[oid].b_firstname} - {$orders[oid].login}{$delimiter}{$config.QuickBooks.trans_class}{$delimiter}-{$orders[oid].cost}{$delimiter}{$orders[oid].orderid}{$delimiter}{$orders[oid].product}{if $orders[oid].product_options ne ""}\n{$orders[oid].product_options}{/if}{$delimiter}{$orders[oid].price}{$delimiter}-{$orders[oid].amount}{$delimiter}{$invitem_name}{$delimiter}N{$delimiter} {/if} +{if %oid.last%} + {if $orders[oid].total gt 0 and $orders[oid].giftcert_discount gt 0} SPL{$delimiter}INVOICE{$delimiter}{$orders[oid].date|date_format:"%m/%d/%Y"}{$delimiter}{$config.QuickBooks.acct_gc_discount}{$delimiter}{$orders[oid].b_lastname}, {$orders[oid].b_firstname} - {$orders[oid].login}{$delimiter}{$config.QuickBooks.trans_class}{$delimiter}{$orders[oid].giftcert_discount}{$delimiter}{$orders[oid].orderid}{$delimiter}{$orders[oid].applied_giftcerts}{$delimiter}-{$orders[oid].giftcert_discount}{$delimiter}-1{$delimiter}GIFT CERTIFICATE(s){$delimiter}N{$delimiter} {/if} -{if %oid.last%} - {* make qb happy *} SPL{$delimiter}INVOICE{$delimiter}{$orders[oid].date|date_format:"%m/%d/%Y"}{$delimiter}{$config.QuickBooks.acct_tax}{$delimiter}{$orders[oid].b_lastname}, {$orders[oid].b_firstname} - {$orders[oid].login}{$delimiter}{$config.QuickBooks.trans_class}{$delimiter}0{$delimiter}{$orders[oid].orderid}{$delimiter}TAX{$delimiter}{$delimiter}{$delimiter}{$delimiter}N{$delimiter}AUTOSTAX