SF.net SVN: ledger-smb:[4445] branches/1.3

[..hidden..]

Revision: 4445
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4445&view=rev
Author:   einhverfr
Date:     2012-03-12 06:37:16 +0000 (Mon, 12 Mar 2012)
Log Message:
-----------
Minor fix to sales quotation latex template

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/templates/demo/sales_quotation.tex

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2012-03-12 02:23:03 UTC (rev 4444)
+++ branches/1.3/Changelog	2012-03-12 06:37:16 UTC (rev 4445)
@@ -14,6 +14,7 @@
 * Can now skip adding the chart of accounts (Erik H)
 * Fixed: can't reconcile accounts in foreign currency (bug 3498036)(Chris T)
 * Fixed: Recon not setup for cash accounts in default COA (Erik H and Chris T)
+* Corrected minor issue with demo sales quotation template (Chris T)
 
 Chris T is Chris Travers
 Erik H is Erik Huelsmann

Modified: branches/1.3/templates/demo/sales_quotation.tex
===================================================================
--- branches/1.3/templates/demo/sales_quotation.tex	2012-03-12 02:23:03 UTC (rev 4444)
+++ branches/1.3/templates/demo/sales_quotation.tex	2012-03-12 06:37:16 UTC (rev 4445)
@@ -83,7 +83,7 @@
   
 \vspace{1cm}
 
..hidden..@{\extracolsep{0pt}}}
..hidden..|..hidden..
   \textbf{<?lsmb text('Number') ?>} & \textbf{<?lsmb text('Description') ?>} 
    & \textbf{<?lsmb text('Qty') ?>} & \textbf{<?lsmb text('Unit') ?>} 
    & \textbf{<?lsmb text('Price') ?>} & \textbf{<?lsmb text('Disc %') ?>} 
@@ -99,6 +99,14 @@
   <?lsmb discountrate.${lc} ?> &
   <?lsmb linetotal.${lc} ?> \\
 <?lsmb END ?>
+\hline \hline
+\multicolumn{6}{r|}{<?lsmb text('Subtotal') ?>} & <?lsmb subtotal ?> \\*
+<?lsmb FOREACH tax ?>
+<?lsmb lc = loop.count - 1 ?>
+\multicolumn{6}{r|}{<?lsmb taxdescription.${lc} 
+                    ?>  on <?lsmb taxbase.${lc} ?> }
+ & <?lsmb tax.${lc} ?> \\*
+<?lsmb END ?>
 \end{longtable}
 
 
@@ -108,19 +116,6 @@
 \vspace{0.2cm}
 
 \hfill
..hidden..@{}}
-  & Subtotal & <?lsmb subtotal ?> \\
-<?lsmb FOREACH tax ?>
-<?lsmb lc = loop.count - 1 ?>
-  & <?lsmb taxdescription.${lc} ?> on <?lsmb taxbase.${lc} ?> & <?lsmb tax.${lc} ?>\\
-<?lsmb END ?>
-  \hline
-  & Total & <?lsmb quototal ?>\\
-\end{tabularx}
-
-\vspace{0.3cm}
-
-\hfill
 <?lsmb text('All prices in [_1].', currency) ?>
 
 <?lsmb IF terms ?>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.