SF.net SVN: ledger-smb:[3667] trunk

[..hidden..]

Revision: 3667
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3667&view=rev
Author:   einhverfr
Date:     2011-08-18 00:37:42 +0000 (Thu, 18 Aug 2011)

Log Message:
-----------
Fixed print button for orders and quotations, and converted sales order to longtable
Also corrected errors about adding missing $'s

Modified Paths:
--------------
    trunk/bin/oe.pl
    trunk/templates/demo/sales_order.tex

Modified: trunk/bin/oe.pl
===================================================================
--- trunk/bin/oe.pl	2011-08-18 00:03:56 UTC (rev 3666)
+++ trunk/bin/oe.pl	2011-08-18 00:37:42 UTC (rev 3667)
@@ -822,6 +822,7 @@
         if ( $form->{id} ) {
 
             $a{'delete'}                = 1;
+            $a{'print'}                = 1;
             $a{'save_as_new'}           = 1;
             $a{'print_and_save_as_new'} = 1 if ${LedgerSMB::Sysconfig::latex};
 

Modified: trunk/templates/demo/sales_order.tex
===================================================================
--- trunk/templates/demo/sales_order.tex	2011-08-18 00:03:56 UTC (rev 3666)
+++ trunk/templates/demo/sales_order.tex	2011-08-18 00:37:42 UTC (rev 3667)
@@ -2,7 +2,10 @@
 \documentclass{scrartcl}
 \usepackage[utf8]{inputenc}
 \usepackage{tabularx}
+\usepackage{longtable}
 \usepackage[letterpaper,top=2cm,bottom=1.5cm,left=1.1cm,right=1.5cm]{geometry}
+\setlength\LTleft{0pt}
+\setlength\LTright{0pt}
 \usepackage{graphicx}
 
 \begin{document}
@@ -15,29 +18,8 @@
 <?lsmb INCLUDE letterhead.tex ?>
 
 
-% Breaking old pagebreak directive
-%<?xlsmb pagebreak 65 27 48 ?>
-%\end{tabularx}
-%
-%  \rule{\textwidth}{2pt}
-%  
-%  \hfill
-%  ..hidden..@{}}
-%  & \textbf{Subtotal} & \textbf{<?xlsmb sumcarriedforward ?>} \\
-%  \end{tabularx}
-%
-%\newpage
-%
-%\markboth{<?xlsmb company ?>\hfill <?xlsmb ordnumber ?>}{<?xlsmb company ?>\hfill <?xlsmb ordnumber ?>}
-%
-%
..hidden..@{}}
-%  \textbf{Item} & \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
-%  \textbf{Unit} & \textbf{Price} & \textbf{Disc \%} & \textbf{Amount} \\
-%  & carried forward from <?xlsmb lastpage ?> & & & & & <?xlsmb sumcarriedforward ?> \\
-%<?xlsmb end pagebreak ?>
+\markboth{<?lsmb company ?>\hfill <?lsmb ordnumber ?>}{<?lsmb company ?>\hfill <?lsmb ordnumber ?>}
 
-
 \vspace*{0.5cm}
 
 \parbox[t]{.5\textwidth}{
@@ -105,7 +87,7 @@
 <?lsmb END ?>
 
 <?lsmb IF shiptofax ?>
-<lsmb text('Fax: [_1] shiptofax) ?>
+<?lsmb text('Fax: [_1]', shiptofax) ?>
 <?lsmb END ?>
 
 <?lsmb shiptoemail ?>
@@ -132,12 +114,13 @@
   
 \vspace{1cm}
 
..hidden..@{}}
..hidden..@{\extracolsep{0pt}}}
   \textbf{<?lsmb text('Item') ?>} & \textbf{<?lsmb text('Number') ?>} 
    & \textbf{<?lsmb text('Description') ?>} & \textbf{<?lsmb text('Qty') ?>} &
   \textbf{<?lsmb text('Unit') ?>} & \textbf{<?lsmb text('Price') ?>} 
   & \textbf{<?lsmb text('Disc %') ?>} 
-  & \textbf{<?lsmb text('Amount') ?>} \\
+  & \textbf{<?lsmb text('Amount') ?>} 
+\endhead
 <?lsmb FOREACH number ?>
 <?lsmb lc = loop.count - 1 ?>
   <?lsmb runningnumber.${lc} ?> &
@@ -149,7 +132,7 @@
   <?lsmb discountrate.${lc} ?> &
   <?lsmb linetotal.${lc} ?> \\
 <?lsmb END ?>
-\end{tabularx}
+\end{longtable}
 
 
 \parbox{\textwidth}{
@@ -172,7 +155,7 @@
 
 <?lsmb text_amount ?> ***** <?lsmb decimal ?>/100
 \hfill
-<lsmb text('All prices in [_1].', currency) ?>
+<?lsmb text('All prices in [_1].', currency) ?>
 
 <?lsmb IF terms ?>
 <?lsmb text('Terms: Net [_1]  days', terms) ?>
@@ -191,4 +174,4 @@
 \rule{\textwidth}{0.5pt}
 
 \end{document}
-<?lsmb END ?>
+<?lsmb END -?>


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