Changed all templates to the new syntax

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@142 4979c152-3d1c-0410-bac9-87ea11338e46

1 files changed, 37 insertions, 37 deletions

diff --git a/templates/Swedish-sales_order.tex b/templates/Swedish-sales_order.tex
index 81534094..744ae427 100755
--- a/templates/Swedish-sales_order.tex
+++ b/templates/Swedish-sales_order.tex
@@ -25,12 +25,12 @@
 

   \parbox{\textwidth}{

     \parbox[b]{12cm}{

-      <%company%>

+      <?lsmb company ?>

       

-      <%address%>}\hfill

+      <?lsmb address ?>}\hfill

     \begin{tabular}[b]{rr@{}}

-    Telefon & <%tel%>\\

-    Telefaks & <%fax%>

+    Telefon & <?lsmb tel ?>\\

+    Telefaks & <?lsmb fax ?>

     \end{tabular}

 

     \rule[1.5ex]{\textwidth}{0.5pt}

@@ -39,62 +39,62 @@
     

 \fontfamily{cmss}\fontshape{n}\selectfont

 

-\markboth{<%company%>\hfill <%ordnumber%>}{\usebox{\hdr}}

+\markboth{<?lsmb company ?>\hfill <?lsmb ordnumber ?>}{\usebox{\hdr}}

 

 \pagestyle{myheadings}

 %\thispagestyle{empty}     use this with letterhead paper

 

-<%pagebreak 65 27 48%>

+<?lsmb pagebreak 65 27 48 ?>

 \end{tabular*}

 

   \rule{\textwidth}{2pt}

   

   \hfill

   \begin{tabularx}{7cm}{Xr@{}}

-  \textbf{Subtotal} & \textbf{<%sumcarriedforward%>} \\

+  \textbf{Subtotal} & \textbf{<?lsmb sumcarriedforward ?>} \\

   \end{tabularx}

 

 \newpage

 

-\markright{<%company%>\hfill <%ordnumber%>}

+\markright{<?lsmb company ?>\hfill <?lsmb ordnumber ?>}

 

 \vspace*{-12pt}

 

 \begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrrr@{}}

   \textbf{Nummer} & \textbf{Beskrivelse} & \textbf{Ant.} &

     \textbf{Enhet} & \textbf{Pris} & \textbf{Rabatt} & \textbf{Sum} \\

-  & carried forward from <%lastpage%> & & & & & <%sumcarriedforward%> \\

-<%end pagebreak%>

+  & carried forward from <?lsmb lastpage ?> & & & & & <?lsmb sumcarriedforward ?> \\

+<?lsmb end pagebreak ?>

 

 

 \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont

 

 \vspace*{2cm}

 

-<%name%>

+<?lsmb name ?>

 

-<%address1%>

+<?lsmb address1 ?>

 

-<%if address2%>

-<%address2%>

-<%end address2%>

+<?lsmb if address2 ?>

+<?lsmb address2 ?>

+<?lsmb end address2 ?>

 

-<%city%> <%state%> <%zipcode%>

+<?lsmb city ?> <?lsmb state ?> <?lsmb zipcode ?>

 

-<%if country%>

-<%country%>

-<%end country%>

+<?lsmb if country ?>

+<?lsmb country ?>

+<?lsmb end country ?>

 

 \vspace{3.5cm}

 

 \textbf{S Ä L J} \parbox{0.3cm}{\hfill} \textbf{O R D E R}

 \hfill

 \begin{tabular}[t]{l@{\hspace{0.3cm}}l}

-  \textbf{Order datum} & <%orddate%> \\

-<%if reqdate%>

-  \textbf{Leverans innan} & <%reqdate%> \\

-<%end reqdate%>

-  \textbf{Ordrenr.} & <%ordnumber%>

+  \textbf{Order datum} & <?lsmb orddate ?> \\

+<?lsmb if reqdate ?>

+  \textbf{Leverans innan} & <?lsmb reqdate ?> \\

+<?lsmb end reqdate ?>

+  \textbf{Ordrenr.} & <?lsmb ordnumber ?>

 \end{tabular}

 

 \vspace{1cm}

@@ -102,10 +102,10 @@
 \begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrrr@{}}

   \textbf{Nummer} & \textbf{Beskrivelse} & \textbf{Ant.} &

     \textbf{Enhet} & \textbf{Pris} & \textbf{Rabatt} & \textbf{Sum} \\

-<%foreach number%>

-  <%number%> & <%description%> & <%qty%> &

-    <%unit%> & <%sellprice%> & <%discount%> & <%linetotal%> \\

-<%end number%>

+<?lsmb foreach number ?>

+  <?lsmb number ?> & <?lsmb description ?> & <?lsmb qty ?> &

+    <?lsmb unit ?> & <?lsmb sellprice ?> & <?lsmb discount ?> & <?lsmb linetotal ?> \\

+<?lsmb end number ?>

 \end{tabular*}

 

 

@@ -116,24 +116,24 @@
 

 \hfill

 \begin{tabularx}{7cm}{Xr@{}}

-  \textbf{Pris ex moms} & \textbf{<%subtotal%>} \\

-<%foreach tax%>

-  <%taxdescription%> on <%taxbase%> & <%tax%>\\

-<%end tax%>

+  \textbf{Pris ex moms} & \textbf{<?lsmb subtotal ?>} \\

+<?lsmb foreach tax ?>

+  <?lsmb taxdescription ?> on <?lsmb taxbase ?> & <?lsmb tax ?>\\

+<?lsmb end tax ?>

   \hline

-  \textbf{Total} & \textbf{<%ordtotal%>}\\

+  \textbf{Total} & \textbf{<?lsmb ordtotal ?>}\\

 \end{tabularx}

 

 \vspace{0.3cm}

 

 \hfill

-  Alla priser i valuta \textbf{<%currency%>}.

+  Alla priser i valuta \textbf{<?lsmb currency ?>}.

 

 \vspace{12pt}

 

-<%if notes%>

-  <%notes%>

-<%end if%>

+<?lsmb if notes ?>

+  <?lsmb notes ?>

+<?lsmb end if ?>

 

 }