From 2d5eaa61c280b217f07f8a8b8125a595e4797a27 Mon Sep 17 00:00:00 2001
From: Mike Evans <mikee@saxicola.co.uk>
Date: Sun, 25 Mar 2012 14:51:36 +0000
Subject: [PATCH] Bug 670008 - taxinvoice lacks flexibility necessary to
 produce legally valid Australian Tax Invoice Fix typo.  Fix column
 misalignment when no taxes are present in the invoice.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22119 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 src/report/business-reports/taxinvoice.eguile.scm | 6 +++---
 src/report/business-reports/taxinvoice.scm        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/report/business-reports/taxinvoice.eguile.scm b/src/report/business-reports/taxinvoice.eguile.scm
index c45cb8717c..c0601f197d 100644
--- a/src/report/business-reports/taxinvoice.eguile.scm
+++ b/src/report/business-reports/taxinvoice.eguile.scm
@@ -70,7 +70,7 @@
            (qty?       #f) ; does any row have qty <> 1?
            (spancols_subtotal	1)	; for subtotal line
            (spancols_payments	0)	; for payments line (between total and subtotal)
-           (spancols_total	0))	; for total line
+           (spancols_total	1))	; for total line
 
       ; load splits, if any
       (if (not (null? lot))
@@ -300,7 +300,7 @@
       <?scm (if discount? (begin ?>
         <th align="right"><?scm:d opt-disc-rate-heading ?></th>
         <th align="right"><?scm:d opt-disc-amount-heading ?></th>
-        <?scm (set! spancols_total (+ spancols_total 3))
+        <?scm (set! spancols_total (+ spancols_total 2))
               (set! spancols_subtotal (+ spancols_subtotal 1)))) ?>
       <?scm (if (and tax? taxtables?) (begin ?>
         <th align="right"><?scm:d opt-net-price-heading ?></th>
@@ -308,7 +308,7 @@
         <th align="right"><?scm:d opt-tax-rate-heading ?></th>
         <?scm (set! spancols_total (+ spancols_total 1)))) ?>
         <th align="right"><?scm:d opt-tax-amount-heading ?></th>
-        <?scm (set! spancols_total (+ spancols_total 3))
+        <?scm (set! spancols_total (+ spancols_total 1))
               (set! spancols_subtotal (+ spancols_subtotal 0)))) ?>
       <th align="right"><?scm:d opt-total-price-heading ?></th>
     </tr>
diff --git a/src/report/business-reports/taxinvoice.scm b/src/report/business-reports/taxinvoice.scm
index 1369cf1399..937a65445e 100644
--- a/src/report/business-reports/taxinvoice.scm
+++ b/src/report/business-reports/taxinvoice.scm
@@ -102,7 +102,7 @@
 (define optname-jobname-text		(N_ "Job Number text"))
 (define optname-jobnumber-text		(N_ "Job Name text"))
 (define optname-jobname-show		(N_ "Show Job name"))
-(define optname-jobnumber-show		(N_ "Sjow Job number"))
+(define optname-jobnumber-show		(N_ "Show Job number"))
 (define optname-invnum-next-to-title	(N_ "Invoice number next to title"))
 (define optname-border-collapse		(N_ "table-border-collapse"))
 (define optname-border-color-th		(N_ "table-header-border-color"))