X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=sql-ledger%2Ftemplates%2FSpanish_A4-packing_list.tex;fp=sql-ledger%2Ftemplates%2FSpanish_A4-packing_list.tex;h=979e14a3b3a5dd1c090eedec0f7660e3c65c0b7b;hp=312c349baa132f4ea4e75344e3edb552a052abb0;hb=32306b5f8ffe4ce594409aa6e89626740b225a39;hpb=52072fcd26f2faf57923f598c358e7f47c4e2643

diff --git a/sql-ledger/templates/Spanish_A4-packing_list.tex b/sql-ledger/templates/Spanish_A4-packing_list.tex
index 312c349ba..979e14a3b 100644
--- a/sql-ledger/templates/Spanish_A4-packing_list.tex
+++ b/sql-ledger/templates/Spanish_A4-packing_list.tex
@@ -41,13 +41,13 @@
 
 <%shiptoname%>
 
-<%shiptoaddr1%>
+<%shiptoaddress1%>
 
-<%shiptoaddr2%>
+<%shiptoaddress2%>
 
-<%shiptoaddr3%>
+<%shiptocity%> <%shiptostate%> <%shiptozipcode%>
 
-<%shiptoaddr4%>
+<%shiptocountry%>
 \end{minipage}
 
 }
@@ -59,7 +59,7 @@
 %\markboth{\usebox{\hdr}}{\usebox{\hdr}}
 %\thispagestyle{empty}     %use this with letterhead paper
 
-<%pagebreak 90 27 48%>
+<%pagebreak 90 27 37%>
 \end{tabular*}
 \newpage
 \usebox{\hdr}
@@ -93,12 +93,12 @@
 
 \begin{flushright}
 \begin{tabularx}{10cm}{Xr@{}}
-  \textbf{Base imponible} & \textbf{<%subtotal%>} \EUR \\
+  \textbf{Base imponible} & \textbf{<%subtotal%>} \\
 <%foreach tax%>
-  IVA (<%taxrate%>\%) sobre <%taxbase%> & <%tax%> \EUR\\
+  IVA (<%taxrate%>\%) sobre <%taxbase%> & <%tax%> \\
 <%end tax%>
   \hline
-  \textbf{Total} & \textbf{<%invtotal%>} \EUR\\
+  \textbf{Total} & \textbf{<%invtotal%>} \\
 \end{tabularx}
 \end{flushright}