From 8efbc44487e0f99236ec55539a61f1d0d04635a9 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 12 Nov 2012 11:42:14 +0100
Subject: [PATCH] Druckvorlagen: 'Default' entfernt, 'German' in 'Standard'
umbenannt
Siehe #2049.
---
bin/mozilla/admin.pl | 5 +-
templates/print/Default/balance_sheet.html | 100 ---
templates/print/Default/bin_list.html | 181 ------
templates/print/Default/bin_list.tex | 114 ----
templates/print/Default/check.tex | 71 ---
templates/print/Default/income_statement.html | 82 ---
templates/print/Default/invoice.html | 309 ----------
templates/print/Default/invoice.tex | 208 -------
templates/print/Default/pick_list.html | 154 -----
templates/print/Default/pick_list.tex | 127 ----
templates/print/Default/purchase_order.html | 224 -------
templates/print/Default/purchase_order.tex | 175 ------
templates/print/Default/receipt.tex | 71 ---
.../print/Default/request_quotation.html | 194 ------
templates/print/Default/request_quotation.tex | 150 -----
templates/print/Default/sales_order.html | 212 -------
templates/print/Default/sales_order.tex | 123 ----
templates/print/Default/sales_quotation.html | 221 -------
templates/print/Default/sales_quotation.tex | 136 ----
templates/print/Default/statement.html | 121 ----
templates/print/Default/statement.tex | 107 ----
templates/print/German/bwa.html | 582 ------------------
templates/print/German/taxbird.txb | 23 -
templates/print/German/ustva-2012.tex | 153 -----
templates/print/German/ustva.html | 436 -------------
templates/print/German/ustva.tex | 120 ----
templates/print/German/winston.xml | 14 -
.../{German => Standard}/balance_sheet.html | 0
.../print/{German => Standard}/bin_list.html | 0
.../print/{German => Standard}/bin_list.tex | 0
.../print/{Default => Standard}/bwa.html | 0
.../print/{German => Standard}/check.tex | 0
.../{German => Standard}/credit_note.tex | 0
.../income_statement.html | 0
.../print/{German => Standard}/invoice.html | 0
.../print/{German => Standard}/invoice.odt | Bin
.../print/{German => Standard}/invoice.tex | 0
.../print/{German => Standard}/pick_list.html | 0
.../print/{German => Standard}/pick_list.tex | 0
.../{German => Standard}/purchase_order.html | 0
.../{German => Standard}/purchase_order.tex | 0
.../print/{German => Standard}/receipt.tex | 0
.../request_quotation.html | 0
.../request_quotation.tex | 0
.../sales_delivery_order.tex | 0
.../{German => Standard}/sales_order.html | 0
.../{German => Standard}/sales_order.tex | 0
.../{German => Standard}/sales_quotation.html | 0
.../{German => Standard}/sales_quotation.odt | Bin
.../{German => Standard}/sales_quotation.tex | 0
.../print/{German => Standard}/statement.html | 0
.../print/{German => Standard}/statement.tex | 0
.../print/{Default => Standard}/taxbird.txb | 0
.../{Default => Standard}/ustva-2012.tex | 0
.../print/{Default => Standard}/ustva.html | 0
.../print/{Default => Standard}/ustva.tex | 0
.../print/{Default => Standard}/winston.xml | 0
.../zahlungserinnerung.tex | 0
.../zahlungserinnerung_invoice.tex | 0
templates/webpages/admin/edit_user.html | 3 +-
60 files changed, 2 insertions(+), 4414 deletions(-)
delete mode 100644 templates/print/Default/balance_sheet.html
delete mode 100644 templates/print/Default/bin_list.html
delete mode 100644 templates/print/Default/bin_list.tex
delete mode 100644 templates/print/Default/check.tex
delete mode 100644 templates/print/Default/income_statement.html
delete mode 100644 templates/print/Default/invoice.html
delete mode 100644 templates/print/Default/invoice.tex
delete mode 100644 templates/print/Default/pick_list.html
delete mode 100644 templates/print/Default/pick_list.tex
delete mode 100644 templates/print/Default/purchase_order.html
delete mode 100644 templates/print/Default/purchase_order.tex
delete mode 100644 templates/print/Default/receipt.tex
delete mode 100644 templates/print/Default/request_quotation.html
delete mode 100644 templates/print/Default/request_quotation.tex
delete mode 100644 templates/print/Default/sales_order.html
delete mode 100644 templates/print/Default/sales_order.tex
delete mode 100644 templates/print/Default/sales_quotation.html
delete mode 100644 templates/print/Default/sales_quotation.tex
delete mode 100644 templates/print/Default/statement.html
delete mode 100644 templates/print/Default/statement.tex
delete mode 100644 templates/print/German/bwa.html
delete mode 100644 templates/print/German/taxbird.txb
delete mode 100644 templates/print/German/ustva-2012.tex
delete mode 100644 templates/print/German/ustva.html
delete mode 100644 templates/print/German/ustva.tex
delete mode 100644 templates/print/German/winston.xml
rename templates/print/{German => Standard}/balance_sheet.html (100%)
rename templates/print/{German => Standard}/bin_list.html (100%)
rename templates/print/{German => Standard}/bin_list.tex (100%)
rename templates/print/{Default => Standard}/bwa.html (100%)
rename templates/print/{German => Standard}/check.tex (100%)
rename templates/print/{German => Standard}/credit_note.tex (100%)
rename templates/print/{German => Standard}/income_statement.html (100%)
rename templates/print/{German => Standard}/invoice.html (100%)
rename templates/print/{German => Standard}/invoice.odt (100%)
rename templates/print/{German => Standard}/invoice.tex (100%)
rename templates/print/{German => Standard}/pick_list.html (100%)
rename templates/print/{German => Standard}/pick_list.tex (100%)
rename templates/print/{German => Standard}/purchase_order.html (100%)
rename templates/print/{German => Standard}/purchase_order.tex (100%)
rename templates/print/{German => Standard}/receipt.tex (100%)
rename templates/print/{German => Standard}/request_quotation.html (100%)
rename templates/print/{German => Standard}/request_quotation.tex (100%)
rename templates/print/{German => Standard}/sales_delivery_order.tex (100%)
rename templates/print/{German => Standard}/sales_order.html (100%)
rename templates/print/{German => Standard}/sales_order.tex (100%)
rename templates/print/{German => Standard}/sales_quotation.html (100%)
rename templates/print/{German => Standard}/sales_quotation.odt (100%)
rename templates/print/{German => Standard}/sales_quotation.tex (100%)
rename templates/print/{German => Standard}/statement.html (100%)
rename templates/print/{German => Standard}/statement.tex (100%)
rename templates/print/{Default => Standard}/taxbird.txb (100%)
rename templates/print/{Default => Standard}/ustva-2012.tex (100%)
rename templates/print/{Default => Standard}/ustva.html (100%)
rename templates/print/{Default => Standard}/ustva.tex (100%)
rename templates/print/{Default => Standard}/winston.xml (100%)
rename templates/print/{German => Standard}/zahlungserinnerung.tex (100%)
rename templates/print/{German => Standard}/zahlungserinnerung_invoice.tex (100%)
diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index 0a7145a60..d2b8fdd34 100755
--- a/bin/mozilla/admin.pl
+++ b/bin/mozilla/admin.pl
@@ -1211,10 +1211,7 @@ sub _search_templates {
my @allmaster = readdir(TEMPLATEDIR);
closedir TEMPLATEDIR;
- @allmaster = sort grep { -d ("$::lx_office_conf{paths}->{templates}/print" . "/$_") && !/^\.\.?$/ } @allmaster;
- @allmaster = reverse grep !/Default/, @allmaster;
- push @allmaster, 'Default';
- @allmaster = reverse @allmaster;
+ @allmaster = ('Standard', sort grep { -d ("$::lx_office_conf{paths}->{templates}/print" . "/$_") && !/^\.\.?$/ && !/^Standard$/ } @allmaster);
return \@alldir, \@allmaster;
}
diff --git a/templates/print/Default/balance_sheet.html b/templates/print/Default/balance_sheet.html
deleted file mode 100644
index 478caabca..000000000
--- a/templates/print/Default/balance_sheet.html
+++ /dev/null
@@ -1,100 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<h2 align=center>
-<%company%>
-<br><%address%>
-
-<p>BALANCE SHEET
-<br><%period%>
-</h2>
-
-<table border=0>
-<tr>
- <th align=left width=400 colspan=2>ASSETS<br><hr align=left width=250 size=5 noshade></th>
- <th><%this_period%></th>
- <th><%last_period%></th>
-</tr>
-
-<%foreach asset_account%>
-<tr>
- <td> </td>
- <td><%asset_account%></td>
- <td align=right><%asset_this_period%></td>
- <td align=right><%asset_last_period%></td>
-</tr>
-<%end asset_account%>
-
-<tr>
- <td colspan=2> </td>
- <td><hr noshade size=1></td>
- <td><hr noshade size=1></td>
-</tr>
-
-<tr valign=top>
- <th align=left colspan=2>TOTAL ASSETS</th>
- <td align=right><%total_assets_this_period%><hr noshade size=2></td>
- <td align=right><%total_assets_last_period%><hr noshade size=2></td>
-</tr>
-
-<tr>
- <th align=left colspan=4>LIABILITIES<b><hr align=left width=250 size=5 noshade></th>
-</tr>
-
-<%foreach liability_account%>
-<tr>
- <td></td>
- <td><%liability_account%></td>
- <td align=right><%liability_this_period%></td>
- <td align=right><%liability_last_period%></td>
-</tr>
-<%end liability_account%>
-
-<tr>
- <td colspan=2> </td>
- <td><hr noshade size=1></td>
- <td><hr noshade size=1></td>
-</tr>
-
-<tr valign=top>
- <td></td>
- <th align=left>Total Liabilities</th>
- <td align=right><%total_liabilities_this_period%><br><hr noshade size=2</td>
- <td align=right><%total_liabilities_last_period%><br><hr noshade size=2</td>
-</tr>
-
-<tr>
- <th align=left colspan=4>SHAREHOLDER'S EQUITY<br><hr align=left width=250 size=5 noshade></th>
-</tr>
-
-<%foreach equity_account%>
-<tr>
- <td></td>
- <td><%equity_account%></td>
- <td align=right><%equity_this_period%></td>
- <td align=right><%equity_last_period%></td>
-</tr>
-<%end equity_account%>
-
-<tr>
- <td colspan=2> </td>
- <td><hr noshade size=1></td>
- <td><hr noshade size=1></td>
-</tr>
-
-<tr valign=top>
- <td></td>
- <th align=left>Total Equity</th>
- <td align=right><%total_equity_this_period%><br><hr noshade size=2</td>
- <td align=right><%total_equity_last_period%><br><hr noshade size=2</td>
-</tr>
-
-<tr valign=top>
- <th align=left colspan=2>TOTAL LIABILITIES & EQUITY</th>
- <td align=right><%total_this_period%><br><hr noshade size=2></td>
- <td align=right><%total_last_period%><br><hr noshade size=2></td>
-</tr>
-</table>
-
-
-
diff --git a/templates/print/Default/bin_list.html b/templates/print/Default/bin_list.html
deleted file mode 100644
index feed5696b..000000000
--- a/templates/print/Default/bin_list.html
+++ /dev/null
@@ -1,181 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<table width=100%>
- <tr>
- <td width=10> </td>
-
- <td>
- <table width=100%>
- <tr>
- <td>
- <h4>
- <%company%>
- <br><%address%>
- </h4>
- </td>
-
- <th><img src=http://localhost/lx-erp/lx-office-erp.png border=0 width=64 height=58></th>
-
- <th align=right>
- <h4>
- Tel: <%tel%>
- <br>Fax: <%fax%>
- </h4>
- </td>
- </tr>
-
- <tr>
- <th colspan=3>
- <h4>B I N L I S T</h4>
- </th>
- </tr>
- </table>
- </td>
- </tr>
-
- <tr>
- <td> </td>
-
- <td>
- <table width=100% cellspacing=0 cellpadding=0>
- <tr bgcolor=000000>
- <th align=left width=50%><font color=ffffff>From</th>
- <th align=left width=50%><font color=ffffff>Ship To</th>
- </tr>
-
- <tr valign=top>
- <td><%name%>
- <br><%street%>
- <br><%zipcode%>
- <br><%city%>
- <br><%country%>
- <br>
-
- <%if contact%>
- <br>Attn: <%contact%>
- <%end contact%>
-
- <%if vendorphone%>
- <br>Tel: <%vendorphone%>
- <%end vendorphone%>
-
- <%if vendorfax%>
- <br>Fax: <%vendorfax%>
- <%end vendorfax%>
-
- <%if email%>
- <br><%email%>
- <%end email%>
-
- </td>
-
- <td><%shiptoname%>
- <br><%shiptostreet%>
- <br><%shiptozipcode%>
- <br><%shiptocity%>
- <br><%shiptocountry%>
-
- <br>
- <%if shiptocontact%>
- <br>Attn: <%shiptocontact%>
- <%end shiptocontact%>
-
- <%if shiptophone%>
- <br>Tel: <%shiptophone%>
- <%end shiptophone%>
-
- <%if shiptofax%>
- <br>Fax: <%shiptofax%>
- <%end shiptofax%>
- </td>
- </tr>
- </table>
- </td>
- </tr>
-
- <tr height=5></tr>
-
- <tr>
- <td> </td>
-
- <td>
- <table width=100% border=1>
- <tr>
- <th width=17% align=left nowrap>Order #</th>
- <th width=17% align=left nowrap>Date</th>
- <th width=17% align=left nowrap>Contact</th>
- <%if warehouse%>
- <th width=17% align=left nowrap>Warehouse</th>
- <%end warehouse%>
- <th width=17% align=left>Shipping Point</th>
- <th width=15% align=left>Ship via</th>
- </tr>
-
- <tr>
- <td><%ordnumber%> </td>
-
- <%if shippingdate%>
- <td><%shippingdate%></td>
- <%end shippingdate%>
-
- <%if not shippingdate%>
- <td><%orddate%></td>
- <%end shippingdate%>
-
- <td><%employee%> </td>
-
- <%if warehouse%>
- <td><%warehouse%></td>
- <%end warehouse%>
-
- <td><%shippingpoint%> </td>
- <td><%shipvia%> </td>
- </tr>
- </table>
- </td>
- </tr>
-
- <tr>
- <td> </td>
-
- <td>
- <table width=100%>
- <tr bgcolor=000000>
- <th align=left><font color=ffffff>Pos</th>
- <th align=left><font color=ffffff>Number</th>
- <th align=left><font color=ffffff>Description</th>
- <th><font color=ffffff>Serialnumber</th>
- <th> </th>
- <th><font color=ffffff>Qty</th>
- <th><font color=ffffff>Recd</th>
- <th> </th>
- <th><font color=ffffff>Bin</th>
- </tr>
-
- <%foreach number%>
- <tr valign=top>
- <td><%runningnumber%></td>
- <td><%number%></td>
- <td><%description%></td>
- <td><%serialnumber%></td>
- <td><%deliverydate%></td>
- <td align=right><%qty%></td>
- <td align=right><%ship%></td>
- <td><%unit%></td>
- <td><%bin%></td>
- </tr>
- <%end number%>
-
- </table>
- </td>
- </tr>
-
- <tr>
- <td> </td>
-
- <td><hr noshade></td>
- </tr>
-
-</table>
-
diff --git a/templates/print/Default/bin_list.tex b/templates/print/Default/bin_list.tex
deleted file mode 100644
index 28b873cda..000000000
--- a/templates/print/Default/bin_list.tex
+++ /dev/null
@@ -1,114 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\usepackage{graphicx}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.7cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-
-\begin{document}
-
-\pagestyle{myheadings}
-\thispagestyle{empty}
-
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\vspace*{-1.3cm}
-
-\parbox{\textwidth}{
- \parbox[b]{.42\textwidth}{%
- <%company%>
-
- <%address%>
- }\hfill
- \begin{tabular}[b]{rr@{}}
- Telephone & <%tel%>\\
- Facsimile & <%fax%>
- \end{tabular}
-
- \rule[1.5ex]{\textwidth}{0.5pt}
-}
-
-
-\vspace*{0.5cm}
-
-\parbox[t]{1cm}{\hfill}
-\parbox[t]{.5\textwidth}{
-\textbf{From}
-\vspace{0.7cm}
-
-<%name%> \\
-<%street%> \\
-<%zipcode%> \\
-<%city%> \\
-<%country%>
-}
-\parbox[t]{.4\textwidth}{
-\textbf{Ship To}
-\vspace{0.7cm}
-
-<%shiptoname%> \\
-<%shiptostreet%> \\
-<%shiptozipcode%> \\
-<%shiptocity%> \\
-<%shiptocountry%>
-}
-\hfill
-
-\vspace{1cm}
-
-\textbf{B I N} \parbox{0.3cm}{\hfill} \textbf{L I S T}
-\hfill
-
-\vspace{1cm}
-
-\begin{tabularx}{\textwidth}{*{6}{|X}|} \hline
- \textbf{Order \#} & \textbf{Date} & \textbf{Contact}
- <%if warehouse%>
- & \textbf{Warehouse}
- <%end warehouse%>
- & \textbf{Shipping Point} & \textbf{Ship via} \\ [0.5em]
- \hline
-
- <%ordnumber%>
- <%if shippingdate%>
- & <%shippingdate%>
- <%end shippingdate%>
- <%if not shippingdate%>
- & <%orddate%>
- <%end shippingdate%>
- & <%employee%>
- <%if warehouse%>
- & <%warehouse%>
- <%end warehouse%>
- & <%shippingpoint%> & <%shipvia%> \\
- \hline
-\end{tabularx}
-
-\vspace{1cm}
-
-\begin{tabularx}{\textwidth}{@{}rlXllrrll@{}}
- \textbf{Pos} & \textbf{Number} & \textbf{Description} & \textbf{Serial Number} & & \textbf{Qty} & \textbf{Recd} & & \textbf{Bin} \\
-
-<%foreach number%>
- <%runningnumber%> & <%number%> & <%description%> & <%serialnumber%> &
- <%deliverydate%> & <%qty%> & <%ship%> & <%unit%> & <%bin%> \\
-<%end number%>
-\end{tabularx}
-
-
-\rule{\textwidth}{2pt}
-
-\end{document}
-
diff --git a/templates/print/Default/check.tex b/templates/print/Default/check.tex
deleted file mode 100644
index 4f97660be..000000000
--- a/templates/print/Default/check.tex
+++ /dev/null
@@ -1,71 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\setlength{\voffset}{0.4cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.0cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-
-\fontfamily{cmss}\fontsize{9pt}{9pt}\selectfont
-
-\parbox[t]{12cm}{
- <%company%>
-
- <%address%>}
-\hfill
-\parbox[t]{6cm}{\hfill <%source%>}
-
-\vspace*{0.6cm}
-
-<%text_amount%> \dotfill <%decimal%>/100 \makebox[0.5cm]{\hfill}
-
-\vspace{0.5cm}
-
-\hfill <%datepaid%> \makebox[2cm]{\hfill} <%amount%>
-
-\vspace{0.5cm}
-
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-\vspace{2.8cm}
-
-<%company%>
-
-\vspace{0.5cm}
-
-<%name%> \hfill <%datepaid%> \hfill <%source%>
-
-\vspace{0.5cm}
-\begin{tabularx}{\textwidth}{lXrr@{}}
-\textbf{Invoice No.} & \textbf{Invoice Date}
- & \textbf{Due} & \textbf{Applied} \\
-<%foreach invnumber%>
-<%invnumber%> & <%invdate%> \dotfill
- & <%due%> & <%paid%> \\
-<%end invnumber%>
-\end{tabularx}
-
-\vfill
-
-\end{document}
-
diff --git a/templates/print/Default/income_statement.html b/templates/print/Default/income_statement.html
deleted file mode 100644
index e9d6a4002..000000000
--- a/templates/print/Default/income_statement.html
+++ /dev/null
@@ -1,82 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<h2 align=center>
-<%company%>
-<br><%address%>
-
-<p>INCOME STATEMENT
-<br><%period%>
-</h2>
-
-
-<table width=100% border=0>
-<tr>
- <th width=400 align=left colspan=2>INCOME<br><hr width=300 size=5 align=left noshade></th>
- <th><%this_period%></th>
- <th><%last_period%></th>
-</tr>
-
-<%foreach income_account%>
-<tr>
- <td width=4> </td>
- <td><%income_account%></td>
- <td align=right><%income_this_period%></td>
- <td align=right><%income_last_period%></td>
-</tr>
-<%end income_account%>
-
-<tr>
- <td colspan=2> </td>
- <td><hr noshade size=1></td>
- <td><hr noshade size=1></td>
-</tr>
-
-<tr valign=top>
- <td> </td>
- <th align=left>Total Income</th>
- <td align=right><%total_income_this_period%><hr noshade size=2></td>
- <td align=right><%total_income_last_period%><hr noshade size=2></td>
-</tr>
-
-<tr>
- <th align=left colspan=2>EXPENSES<br><hr width=300 size=5 align=left noshade></th>
-</tr>
-
-<%foreach expense_account%>
-<tr>
- <td> </td>
- <td><%expense_account%></td>
- <td align=right><%expenses_this_period%></td>
- <td align=right><%expenses_last_period%></td>
-</tr>
-<%end expense_account%>
-
-<tr>
- <td colspan=2> </td>
- <td><hr noshade size=1></td>
- <td><hr noshade size=1></td>
-</tr>
-
-<tr valign=top>
- <td> </td>
- <th align=left>Total Expenses</th>
- <td align=right><%total_expenses_this_period%><br><hr noshade size=2</td>
- <td align=right><%total_expenses_last_period%><br><hr noshade size=2</td>
-</tr>
-
-<tr valign=top>
- <th align=left colspan=2>INCOME / (LOSS)</th>
- <td align=right><%total_this_period%><br><hr noshade size=2></td>
- <td align=right><%total_last_period%><br><hr noshade size=2></td>
-</tr>
-
-</table>
-
-
-
-
-
-
-
-
diff --git a/templates/print/Default/invoice.html b/templates/print/Default/invoice.html
deleted file mode 100644
index b44981bce..000000000
--- a/templates/print/Default/invoice.html
+++ /dev/null
@@ -1,309 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<table width=100%>
-<tr valign=bottom>
- <td width=10> </td>
- <td>
-
- <table width=100%>
- <tr>
- <td>
- <h4>
- <%company%>
- <br><%address%>
- </h4>
- </td>
-
- <td align=right>
- <h4>
- Telephone: <%tel%>
- <br>Facsimile: <%fax%>
- </h4>
- </td>
- </tr>
-
- <tr>
- <th colspan=3>
- <h4>I N V O I C E</h4>
- </th>
- </tr>
-
- </table>
-
-
- <table width=100% callspacing=0 cellpadding=0>
-
- <tr>
- <td align=right>
- <table>
- <tr>
- <th align=right>Invoice Date</th><td width=10> </td><td><%invdate%></td>
- </tr>
-
- <tr>
- <th align=right>Due Date</th><td width=10> </td><td><%duedate%></td>
- </tr>
-
- <tr>
- <th align=right>Number</th><td> </td><td><%invnumber%></td></tr>
- </tr>
-
-<!--
- <tr>
- <th align=right>Clerk:</th><td> </td><td><%employee%></td>
- </tr>
--->
-
- <tr>
- <td> </td>
- </tr>
- </td>
- </table>
- </tr>
-
- <tr>
- <td>
- <table width=100%>
- <tr bgcolor=000000>
- <th align=left><font color=ffffff>To:</th>
- <th align=left><font color=ffffff>Ship To:</th>
- </tr>
-
-<!--
- other variables which can be use:
- contact, shiptocontact, shiptophone, shiptofax
--->
-
- <tr valign=top>
- <td><%name%>
- <br><%street%>
- <br><%zipcode%>
- <br><%city%>
- <br><%country%>
- </td>
-
- <td><%shiptoname%>
- <br><%shiptostreet%>
- <br><%shiptozipcode%>
- <br><%shiptocity%>
- <br><%shiptocountry%>
- </td>
- </tr>
- </table>
- </td>
- </tr>
-
- <tr>
- <td> </td>
- </tr>
-
- <tr>
- <td>
- <table width=100%>
- <tr bgcolor=000000>
-<!-- <th align=right><font color=ffffff>No.</th> -->
- <th align=left><font color=ffffff>Number</th>
- <th align=left><font color=ffffff>Description</th>
- <th><font color=ffffff>Qt'y</th>
- <th> </th>
- <th><font color=ffffff>Price</th>
- <th><font color=ffffff>Disc</th>
- <th><font color=ffffff>Amount</th>
- </tr>
-
-<%foreach number%>
- <tr valign=top>
-<!-- <td align=right><%runningnumber%>.</td>
-adjust the colspan if you include this to shift subtotal one to the right
--->
- <td><%number%></td>
- <td><%description%></td>
- <td align=right><%qty%></td>
- <td><%unit%></td>
- <td align=right><%sellprice%></td>
- <td align=right><%discount%></td>
- <td align=right><%linetotal%></td>
- </tr>
-<%end number%>
-
-<!--
-you can also use netprice instead of sellprice if you
-don't want to show the discount
-netprice = sellprice - discount
--->
-
- <tr>
- <td colspan=7><hr noshade></td>
- </tr>
-
- <tr>
-<%if taxincluded%>
- <th colspan=5 align=right>Total</th>
- <td colspan=2 align=right><%invtotal%></td>
-<%end taxincluded%>
-<%if not taxincluded%>
- <th colspan=5 align=right>Subtotal</th>
- <td colspan=2 align=right><%subtotal%></td>
-<%end taxincluded%>
- </tr>
-
-<%foreach tax%>
- <tr>
- <th colspan=5 align=right><%taxdescription%> on <%taxbase%> @ <%taxrate%> %</th>
- <td colspan=2 align=right><%tax%></td>
- </tr>
-<%end tax%>
-
-<%if paid%>
- <tr>
- <th colspan=5 align=right>Paid</th>
- <td colspan=2 align=right>- <%paid%></td>
- </tr>
-<%end paid%>
-
- <tr>
- <td colspan=3> </td>
- <td colspan=4><hr noshade></td>
- </tr>
-
- <tr>
- <td colspan=3>Terms Net <b><%terms%></b> days</td>
- <th colspan=2 align=right>Outstanding</th>
- <th colspan=2 align=right><%total%></th>
- </tr>
-
- <tr>
- <td> </td>
- </tr>
-
- </table>
- </td>
- </tr>
-
-<tr>
- <td>
- <table width=100%>
- <tr valign=top>
-<%if notes%>
- <td>Notes</td>
- <td><%notes%></td>
-<%end notes%>
- <td align=right>
- All prices in <b><%currency%></b> Funds
- <br><%shippingpoint%>
- </td>
- </tr>
-
- </table>
- </td>
-</tr>
-
-<tr><td> </td></tr>
-
-<%if paid%>
-<tr>
- <td colspan=7>
- <table width=60%>
- <tr>
- <th align=left>Payments</th>
- </tr>
- <tr>
- <td colspan=4>
- <hr noshade>
- </td>
- </tr>
- <tr>
- <th align=left>Date</th>
- <th align=left>Account</th>
- <th align=left>Source</th>
- <th align=left>Amount</th>
- </tr>
-<%end paid%>
-
-<%foreach payment%>
- <tr>
- <td><%paymentdate%></td>
- <td><%paymentaccount%></td>
- <td><%paymentsource%></td>
- <td><%payment%></td>
- </tr>
-<%end payment%>
-
-<%if paid%>
- </table>
- </td>
-</tr>
-
-<tr>
- <td> </td>
-</tr>
-<%end paid%>
-
-<tr>
- <th colspan=7>
- <br>Thank you for your valued business!
- </th>
-</tr>
-
-<tr><td> </td></tr>
-
-<tr>
- <td>
- <table width=100%>
- <tr valign=top>
- <td><font size=-3>
- Payment due NET <%terms%> Days from date of Invoice.
- Interest on overdue amounts will acrue at the rate of 1.5% per month
- from due date until paid in full. Items returned are subject to
- a 10% restocking charge. A return authorization must be obtained
- from <%company%> before goods are returned. Returns must be shipped
- prepaid and properly insured. <%company%> will not be responsible
- for damages during transit.
- </font>
- </td>
- <td width=150>
- X <hr noshade>
- </td>
- </tr>
- </table>
- </td>
-</tr>
-
-<%foreach tax%>
- <tr>
- <th colspan=7 align=left><font size=-2><%taxdescription%> Registration <%taxnumber%></th>
- </tr>
-<%end tax%>
-
-<%if taxincluded%>
- <tr>
- <th colspan=7 align=left><font size=-2>Taxes shown are included in price.</th>
- </tr>
-<%end taxincluded%>
-
-<!-- business number
- <tr>
- <th colspan=7 align=left><font size=-2>Business Number: <%businessnumber%></font></th>
- </tr>
--->
-
-<!-- banking information
- <tr>
- <th colspan=7 align=left>Banking Information:
- <br>Bank
- <br>Transit No.
- <br>Account No.
- </td>
- </tr>
--->
-
-</table>
-
-</td>
-</tr>
-</table>
-
-</body>
-</html>
-
diff --git a/templates/print/Default/invoice.tex b/templates/print/Default/invoice.tex
deleted file mode 100644
index 62d479101..000000000
--- a/templates/print/Default/invoice.tex
+++ /dev/null
@@ -1,208 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-
-\newsavebox{\hdr}
-\sbox{\hdr}{
- \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
- \parbox{\textwidth}{
- \parbox[b]{12cm}{
- <%company%>
-
- <%address%>}\hfill
- \begin{tabular}[b]{rr@{}}
- Telephone & <%tel%>\\
- Facsimile & <%fax%>
- \end{tabular}
-
- \rule[1.5ex]{\textwidth}{0.5pt}
- }
-}
-
-\fontfamily{cmss}\fontshape{n}\selectfont
-
-\markboth{<%company%>\hfill <%invnumber%>}{\usebox{\hdr}}
-
-\pagestyle{myheadings}
-%\thispagestyle{empty} use this with letterhead paper
-
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\vspace*{0.5cm}
-
-\parbox[t]{1cm}{\hfill}
- \parbox[t]{10.5cm}{
- \textbf{To}
- \vspace{0.5cm}
-
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-\vspace{0.3cm}
-
-%<%if contact%>
-%Attn: <%contact%>
-%\vspace{0.3cm}
-%<%end contact%>
-\vspace{0.5cm}
-
-<%if customerphone%>
-Tel: <%customerphone%>
-<%end customerphone%>
-
-<%if customerfax%>
-Fax: <%customerfax%>
-<%end customerfax%>
-
-<%email%>
-}
-\parbox[t]{7.5cm}{
-\textbf{Ship To}
-\vspace{0.5cm}
-
-<%shiptoname%>
-
-<%shiptostreet%>
-
-<%shiptozipcode%>
-
-<%shiptocity%>
-
-<%shiptocountry%>
-
-\vspace{0.3cm}
-
-\vspace{0.3cm}
-
-<%if shiptocontact%>
-Attn: <%shiptocontact%>
-\vspace{0.3cm}
-<%end shiptocontact%>
-
-<%if shiptophone%>
-Tel: <%shiptophone%>
-<%end shiptophone%>
-
-<%if shiptofax%>
-Fax: <%shiptofax%>
-<%end shiptofax%>
-
-<%shiptoemail%>
-}
-\hfill
-
-\vspace{1cm}
-
-\textbf{I N V O I C E}
-\hfill
-
-\vspace{1cm}
-
-\begin{tabular}[t]{l@{\hspace{0.3cm}}l}
- \textbf{Date} & <%invdate%> \\
- \textbf{Number} & <%invnumber%> \\
- \textbf{Order} & <%ordnumber%> \\
- \textbf{Clerk} & <%employee%>
-\end{tabular}
-
-\vspace{1cm}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrrr@{}}
- \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
- \textbf{Unit} & \textbf{Price} & \textbf{Disc} & \textbf{Amount} \\
-<%foreach number%>
- <%number%> & <%description%> & <%qty%> &
- <%unit%> & <%sellprice%> & <%discount%> & <%linetotal%> \\
-<%end number%>
-\end{tabular*}
-
-
-\parbox{\textwidth}{
-\rule{\textwidth}{2pt}
-
-\vspace{0.2cm}
-
-\hfill
-\begin{tabularx}{7cm}{Xr@{}}
- \textbf{Subtotal} & \textbf{<%subtotal%>} \\
-<%foreach tax%>
- <%taxdescription%> on <%taxbase%> & <%tax%> \\
-<%end tax%>
-<%if paid%>
- \textbf{Paid} & - <%paid%> \\
-<%end paid%>
- \hline
- \textbf{Balance Owing} & \textbf{<%total%>} \\
-\end{tabularx}
-
-\vspace{0.3cm}
-
-\hfill
- All prices in \textbf{<%currency%>} funds.
-
-\vspace{12pt}
-
-<%if notes%>
- <%notes%>
-<%end if%>
-
-}
-
-\vfill
-
-<%if paid%>
-\begin{tabularx}{10cm}{@{}lXlr@{}}
- \textbf{Payments} & & & \\
- \hline
- \textbf{Date} & \textbf{Account} & \textbf{Source} & \textbf{Amount} \\
-<%end paid%>
-<%foreach payment%>
- <%paymentdate%> & <%paymentaccount%> & <%paymentsource%> & <%payment%> \\
-<%end payment%>
-<%if paid%>
-\end{tabularx}
-<%end paid%>
-
-\vspace{1cm}
-
-\centerline{\textbf{Thank You for your valued business!}}
-
-\renewcommand{\thefootnote}{\fnsymbol{footnote}}
-
-\footnotetext[1]{\tiny
-Payment due NET <%terms%> Days from date of Invoice. Interest on overdue
-amounts will acrue at the rate of 1.5\% per month starting <%duedate%>
-until paid in full. Items returned are subject to a 10\% restocking charge.
-A return authorization must be obtained from <%company%> before goods are
-returned. Returns must be shipped prepaid and properly insured.
-<%company%> will not be responsible for damages during transit.}
-
-\end{document}
-
-
-
diff --git a/templates/print/Default/pick_list.html b/templates/print/Default/pick_list.html
deleted file mode 100644
index 365ccc161..000000000
--- a/templates/print/Default/pick_list.html
+++ /dev/null
@@ -1,154 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<table width=100%>
- <tr>
- <td width=10> </td>
-
- <td>
- <table width=100%>
- <tr>
- <td>
- <h4>
- <%company%>
- <br><%address%>
- </h4>
- </td>
-
- <th><img src=http://localhost/lx-erp/lx-office-erp.png border=0 width=64 height=58></th>
-
- <td align=right>
- <h4>
- Tel: <%tel%>
- <br>Fax: <%fax%>
- </h4>
- </td>
- </tr>
-
- <tr>
- <th colspan=3>
- <h4>P I C K L I S T</h4>
- </th>
- </tr>
- </table>
- </td>
- </tr>
-
- <tr>
- <td> </td>
-
- <td>
- <table width=100% callspacing=0 cellpadding=0>
- <tr bgcolor=000000>
- <th width=50% align=left><font color=ffffff>Ship To:</th>
- <th width=50%> </th>
- </tr>
-
- <tr valign=top>
- <td><%shiptoname%>
- <br><%shiptostreet%>
- <br><%shiptozipcode%>
- <br><%shiptocity%>
- <br><%shiptocountry%>
- </td>
-
- <td>
- <%if shiptocontact%>
- <br>Attn: <%shiptocontact%>
- <%end shiptocontact%>
-
- <%if shiptophone%>
- <br>Tel: <%shiptophone%>
- <%end shiptophone%>
-
- <%if shiptofax%>
- <br>Fax: <%shiptofax%>
- <%end shiptofax%>
-
- <%shiptoemail%>
- </td>
- </tr>
- </table>
- </td>
- </tr>
-
- <tr height=5></tr>
-
- <tr>
- <td> </td>
-
- <td>
- <table width=100% border=1>
- <tr>
- <th width=17% align=left>Order #</th>
- <th width=17% align=left>Date</th>
- <th width=17% align=left nowrap>Contact</th>
- <%if warehouse%>
- <th width=17% align=left>Warehouse</th>
- <%end warehouse%>
- <th width=17% align=left>Shipping Point</th>
- <th width=15% align=left>Ship via</th>
- </tr>
-
- <tr>
- <td><%ordnumber%> </td>
-
- <%if shippingdate%>
- <td><%shippingdate%></td>
- <%end shippingdate%>
-
- <%if not shippingdate%>
- <td><%orddate%></td>
- <%end shippingdate%>
-
- <td><%employee%> </td>
-
- <%if warehouse%>
- <td><%warehouse%> </td>
- <%end warehouse%>
-
- <td><%shippingpoint%> </td>
- <td><%shipvia%> </td>
- </tr>
- </table>
- </td>
- </tr>
-
- <tr>
- <td> </td>
-
- <td>
- <table width=100%>
- <tr bgcolor=000000>
- <th align=left><font color=ffffff>Pos</th>
- <th align=left><font color=ffffff>Number</th>
- <th align=left><font color=ffffff>Description</th>
- <th><font color=ffffff>Qty</th>
- <th><font color=ffffff>Ship</th>
- <th> </th>
- <th><font color=ffffff>Bin</th>
- </tr>
-
- <%foreach number%>
- <tr valign=top>
- <td><%runningnumber%>
- <td><%number%></td>
- <td><%description%></td>
- <td align=right><%qty%></td>
- <td align=right>[ ]</td>
- <td><%unit%></td>
- <td align=right><%bin%></td>
- </tr>
- <%end number%>
- </table>
- </td>
- </tr>
-
- <tr>
- <td> </td>
-
- <td><hr noshade></td>
- </tr>
-
-</table>
-
diff --git a/templates/print/Default/pick_list.tex b/templates/print/Default/pick_list.tex
deleted file mode 100644
index e84b67cd8..000000000
--- a/templates/print/Default/pick_list.tex
+++ /dev/null
@@ -1,127 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\usepackage{graphicx}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.7cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-
-\begin{document}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\pagestyle{myheadings}
-\thispagestyle{empty}
-
-\vspace*{-1.3cm}
-
-\parbox{\textwidth}{
- \parbox[b]{.42\textwidth}{
- <%company%>
-
- <%address%>
- }
- \parbox[b]{.2\textwidth}{
- \includegraphics[scale=0.3]{sql-ledger}
- }\hfill
- \begin{tabular}[b]{rr@{}}
- Telephone & <%tel%>\\
- Facsimile & <%fax%>
- \end{tabular}
-
- \rule[1.5ex]{\textwidth}{0.5pt}
-}
-
-
-\vspace*{0.5cm}
-
-\parbox[t]{1cm}{\hfill}
-\parbox[t]{.5\textwidth}{
- \textbf{Ship To}
-} \hfill
-
-\vspace{0.7cm}
-
-\parbox[t]{1cm}{\hfill}
-\parbox[t]{.5\textwidth}{
-
-<%shiptoname%> \\
-<%shiptostreet%> \\
-<%shiptozipcode%> \\
-<%shiptocity%> \\
-<%shiptocountry%>
-}
-\parbox[t]{.4\textwidth}{
- <%shiptocontact%>
-
- <%if shiptophone%>
- Tel: <%shiptophone%>
- <%end shiptophone%>
-
- <%if shiptofax%>
- Fax: <%shiptofax%>
- <%end shiptofax%>
-
- <%shiptoemail%>
-}
-\hfill
-
-\vspace{1cm}
-
-\textbf{P I C K} \parbox{0.3cm}{\hfill} \textbf{L I S T}
-\hfill
-
-\vspace{1cm}
-
-\begin{tabularx}{\textwidth}{*{6}{|X}|} \hline
- \textbf{Order \#} & \textbf{Date} & \textbf{Contact}
- <%if warehouse%>
- & \textbf{Warehouse}
- <%end warehouse%>
- & \textbf{Shipping Point} & \textbf{Ship via} \\ [0.5em]
- \hline
- <%ordnumber%>
- <%if shippingdate%>
- & <%shippingdate%>
- <%end shippingdate%>
- <%if not shippingdate%>
- & <%orddate%>
- <%end shippingdate%>
- & <%employee%>
- <%if warehouse%>
- & <%warehouse%>
- <%end warehouse%>
- & <%shippingpoint%> & <%shipvia%> \\
- \hline
-\end{tabularx}
-
-\vspace{1cm}
-
-\begin{tabular*}{\textwidth}{@{}rlp{\descrwidth}@{\extracolsep\fill}rcll@{}}
- \textbf{Pos} & \textbf{Number} & \textbf{Description} &
- \textbf{Qty} & \textbf{Ship} & & \textbf{Bin} \\
-<%foreach number%>
- <%runningnumber%> & <%number%> & <%description%> &
- <%qty%> & [\hspace{1cm}] & <%unit%> & <%bin%> \\
-<%end number%>
-\end{tabular*}
-
-
-\parbox{\textwidth}{
-\rule{\textwidth}{2pt}
-}
-
-\end{document}
-
diff --git a/templates/print/Default/purchase_order.html b/templates/print/Default/purchase_order.html
deleted file mode 100644
index 312ffc67d..000000000
--- a/templates/print/Default/purchase_order.html
+++ /dev/null
@@ -1,224 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<table width=100%>
-<tr valign=bottom>
- <td width=10> </td>
- <td>
-
- <table width=100%>
- <tr>
- <td>
- <h4>
- <%company%>
- <br><%address%>
- </h4>
- </td>
-
- <td align=right>
- <h4>
- Telephone: <%tel%>
- <br>Facsimile: <%fax%>
- </h4>
- </td>
- </tr>
-
- <tr>
- <th colspan=3>
- <h4>P U R C H A S E O R D E R</h4>
- </th>
- </tr>
-
- </table>
-
-
- <table width=100% callspacing=0 cellpadding=0>
-
- <tr>
- <td align=right>
- <table>
- <tr>
- <th align=right>Order Date</th><td width=10> </td><td><%orddate%></td>
- </tr>
-
- <tr>
- <th align=right>Required by</th><td width=10> </td><td><%reqdate%></td>
- </tr>
-
- <tr>
- <th align=right>Number</th><td> </td><td><%ordnumber%></td></tr>
- </tr>
-
- <tr>
- <td> </td>
- </tr>
- </td>
- </table>
- </tr>
-
- <tr>
- <td>
- <table width=100%>
- <tr bgcolor=000000>
- <th align=left width=50%><font color=ffffff>To:</th>
- <th align=left width=50%><font color=ffffff>Ship To:</th>
- </tr>
-
- <tr valign=top>
- <td><%name%>
- <br><%street%>
- <br><%zipcode%>
- <br><%city%>
- <br><%country%>
-
-<br>
-<%if contact%>
-<br>Attn: <%contact%>
-<%end contact%>
-<%if vendorphone%>
-<br>Tel: <%vendorphone%>
-<%end vendorphone%>
-<%if vendorfax%>
-<br>Fax: <%vendorfax%>
-<%end vendorfax%>
- </td>
-
- <td><%shiptoname%>
- <br><%shiptostreet%>
- <br><%shiptozipcode%>
- <br><%shiptocity%>
- <br><%shiptocountry%>
-
-<br>
-<%if shiptocontact%>
-<br>Attn: <%shiptocontact%>
-<%end shiptocontact%>
-<%if shiptophone%>
-<br>Tel: <%shiptophone%>
-<%end shiptophone%>
-<%if shiptofax%>
-<br>Fax: <%shiptofax%>
-<%end shiptofax%>
-
- </tr>
- </table>
- </td>
- </tr>
-
- <tr>
- <td> </td>
- </tr>
-
- <tr>
- <td>
- <table width=100%>
- <tr bgcolor=000000>
-<!-- <th align=right><font color=ffffff>No.</th> -->
- <th align=left><font color=ffffff>Number</th>
- <th align=left><font color=ffffff>Description</th>
- <th><font color=ffffff>Qt'y</th>
- <th> </th>
- <th><font color=ffffff>Price</th>
- <th><font color=ffffff>Amount</th>
- </tr>
-
-<%foreach number%>
- <tr valign=top>
-<!-- <td align=right><%runningnumber%>.</td>
-adjust the colspan if you include this to shift subtotal one to the right
--->
- <td><%number%></td>
- <td><%description%></td>
- <td align=right><%qty%></td>
- <td><%unit%></td>
- <td align=right><%sellprice%></td>
- <td align=right><%linetotal%></td>
- </tr>
-<%end number%>
-
- <tr>
- <td colspan=6><hr noshade></td>
- </tr>
-
- <tr>
- <th colspan=4 align=right>Subtotal</th>
- <td colspan=2 align=right><%subtotal%></td>
- </tr>
-
-<%foreach tax%>
- <tr>
- <th colspan=4 align=right><%taxdescription%> @ <%taxrate%> %</th>
- <td colspan=2 align=right><%tax%></td>
- </tr>
-<%end tax%>
-
- <tr>
- <td colspan=2> </td>
- <td colspan=4><hr noshade></td>
- </tr>
-
- <tr>
- <td colspan=2>Terms Net <b><%terms%></b> days</td>
- <th colspan=2 align=right>Total</th>
- <th colspan=2 align=right><%ordtotal%></th>
- </tr>
-
- <tr>
- <td> </td>
- </tr>
-
- </table>
- </td>
- </tr>
-
-<tr>
- <td>
- <table width=100%>
- <tr valign=top>
-<%if notes%>
- <td>Notes</td>
- <td><pre><%notes%></pre></td>
-<%end notes%>
- <td align=right>
- All prices in <b><%currency%></b> Funds
- <br><%shippingpoint%>
- </td>
- </tr>
-
- </table>
- </td>
-</tr>
-
-<tr><td> </td></tr>
-
-<tr>
- <td>
- <table width=100%>
- <tr valign=top>
- <td><font size=-3>
- Payment due NET <%terms%> Days from date of Invoice.
- Interest on overdue amounts will acrue at the rate of 1.5% per month
- from due date until paid in full. Items returned are subject to
- a 10% restocking charge. A return authorization must be obtained
- from <%company%> before goods are returned. Returns must be shipped
- prepaid and properly insured. <%company%> will not be responsible
- for damages during transit.
- </font>
- </td>
- <td width=150>
- X <hr noshade>
- </td>
- </tr>
- </table>
- </td>
-</tr>
-
-</table>
-
-</td>
-</tr>
-</table>
-
-</body>
-</html>
-
diff --git a/templates/print/Default/purchase_order.tex b/templates/print/Default/purchase_order.tex
deleted file mode 100644
index b4959de9b..000000000
--- a/templates/print/Default/purchase_order.tex
+++ /dev/null
@@ -1,175 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-
-\newsavebox{\hdr}
-\sbox{\hdr}{
- \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
- \parbox{\textwidth}{
- \parbox[b]{12cm}{
- <%company%>
-
- <%address%>}\hfill
- \begin{tabular}[b]{rr@{}}
- Telephone & <%tel%>\\
- Facsimile & <%fax%>
- \end{tabular}
-
- \rule[1.5ex]{\textwidth}{0.5pt}
- }
-}
-
-\fontfamily{cmss}\fontshape{n}\selectfont
-
-\markboth{<%company%>\hfill <%ordnumber%>}{\usebox{\hdr}}
-
-\pagestyle{myheadings}
-%\thispagestyle{empty} use this with letterhead paper
-
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\vspace*{0.5cm}
-
-\parbox[t]{1cm}{\hfill}
-\parbox[t]{10.5cm}{
-\textbf{To}
-\vspace{0.5cm}
-
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-\vspace{0.3cm}
-
-<%if contact%>
-Attn: <%contact%>
-\vspace{0.3cm}
-<%end contact%>
-
-<%if vendorphone%>
-Tel: <%vendorphone%>
-<%end vendorphone%>
-
-<%if vendorfax%>
-Fax: <%vendorfax%>
-<%end vendorfax%>
-
-<%email%>
-}
-\parbox[t]{7.5cm}{
-\textbf{Ship To}
-\vspace{0.5cm}
-
-<%shiptoname%>
-
-<%shiptostreet%>
-
-<%shiptozipcode%>
-
-<%shiptocity%>
-
-<%shiptocountry%>
-
-\vspace{0.3cm}
-
-<%if shiptocontact%>
-Attn: <%shiptocontact%>
-\vspace{0.3cm}
-<%end shiptocontact%>
-
-<%if shiptophone%>
-Tel: <%shiptophone%>
-<%end shiptophone%>
-
-<%if shiptofax%>
-Fax: <%shiptofax%>
-<%end shiptofax%>
-
-<%shiptoemail%>
-}
-\hfill
-
-\vspace{1cm}
-
-\textbf{P U R C H A S E} \parbox{0.3cm}{\hfill} \textbf{O R D E R}
-\hfill
-\begin{tabular}[t]{l@{\hspace{0.3cm}}l}
- \textbf{Date} & <%orddate%> \\
-<%if reqdate%>
- \textbf{Required by} & <%reqdate%> \\
-<%end reqdate%>
- \textbf{Number} & <%ordnumber%>
-\end{tabular}
-
-\vspace{1cm}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrr@{}}
- \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
- \textbf{Unit} & \textbf{Price} & \textbf{Amount} \\
-<%foreach number%>
- <%number%> & <%description%> & <%qty%> &
- <%unit%> & <%sellprice%> & <%linetotal%> \\
-<%end number%>
-\end{tabular*}
-
-
-\parbox{\textwidth}{
-\rule{\textwidth}{2pt}
-
-\vspace{0.2cm}
-
-\hfill
-\begin{tabularx}{7cm}{Xr@{}}
- \textbf{Subtotal} & \textbf{<%subtotal%>} \\
-<%foreach tax%>
- <%taxdescription%> on <%taxbase%> & <%tax%>\\
-<%end tax%>
- \hline
- \textbf{Total} & \textbf{<%ordtotal%>}\\
-\end{tabularx}
-
-\vspace{0.3cm}
-
-\hfill
- All prices in \textbf{<%currency%>} funds.
-
-\vspace{12pt}
-
-<%if notes%>
- <%notes%>
-<%end if%>
-
-}
-
-
-%\renewcommand{\thefootnote}{\fnsymbol{footnote}}
-
-%\footnotetext[1]{\tiny }
-
-\end{document}
-
-
diff --git a/templates/print/Default/receipt.tex b/templates/print/Default/receipt.tex
deleted file mode 100644
index 4f97660be..000000000
--- a/templates/print/Default/receipt.tex
+++ /dev/null
@@ -1,71 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\setlength{\voffset}{0.4cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.0cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-
-\fontfamily{cmss}\fontsize{9pt}{9pt}\selectfont
-
-\parbox[t]{12cm}{
- <%company%>
-
- <%address%>}
-\hfill
-\parbox[t]{6cm}{\hfill <%source%>}
-
-\vspace*{0.6cm}
-
-<%text_amount%> \dotfill <%decimal%>/100 \makebox[0.5cm]{\hfill}
-
-\vspace{0.5cm}
-
-\hfill <%datepaid%> \makebox[2cm]{\hfill} <%amount%>
-
-\vspace{0.5cm}
-
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-\vspace{2.8cm}
-
-<%company%>
-
-\vspace{0.5cm}
-
-<%name%> \hfill <%datepaid%> \hfill <%source%>
-
-\vspace{0.5cm}
-\begin{tabularx}{\textwidth}{lXrr@{}}
-\textbf{Invoice No.} & \textbf{Invoice Date}
- & \textbf{Due} & \textbf{Applied} \\
-<%foreach invnumber%>
-<%invnumber%> & <%invdate%> \dotfill
- & <%due%> & <%paid%> \\
-<%end invnumber%>
-\end{tabularx}
-
-\vfill
-
-\end{document}
-
diff --git a/templates/print/Default/request_quotation.html b/templates/print/Default/request_quotation.html
deleted file mode 100644
index c1980fd04..000000000
--- a/templates/print/Default/request_quotation.html
+++ /dev/null
@@ -1,194 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<table width=100%>
-<tr valign=bottom>
- <td width=10> </td>
- <td>
-
- <table width=100%>
- <tr>
- <td>
- <h4>
- <%company%>
- <br><%address%>
- </h4>
- </td>
-
- <td><img src=http://localhost/lx-erp/lx-office-erp.png border=0 width=64 height=58>
- </td>
-
- <td align=right>
- <h4>
- Tel: <%tel%>
- <br>Fax: <%fax%>
- </h4>
- </td>
- </tr>
-
- <tr>
- <th colspan=3>
- <h4>R E Q U E S T F O R Q U O T A T I O N</h4>
- </th>
- </tr>
-
- </table>
-
-
- <table width=100% callspacing=0 cellpadding=0>
-
- <tr>
- <td>
- <table width=100%>
- <tr bgcolor=000000>
- <th align=left width=50%><font color=ffffff>To:</th>
- <th align=left width=50%><font color=ffffff>Ship To:</th>
- </tr>
-
- <tr valign=top>
- <td><%name%>
- <br><%street%>
- <br><%zipcode%>
- <br><%city%>
- <br><%country%>
-<br>
-<%if contact%>
-<br>Attn: <%contact%>
-<%end contact%>
-<%if vendorphone%>
-<br>Tel: <%vendorphone%>
-<%end vendorphone%>
-<%if vendorfax%>
-<br>Fax: <%vendorfax%>
-<%end vendorfax%>
- </td>
-
- <td><%shiptoname%>
- <br><%shiptostreet%>
- <br><%shiptozipcode%>
- <br><%shiptocity%>
- <br><%shiptocountry%>
-<br>
-<%if shiptocontact%>
-<br>Attn: <%shiptocontact%>
-<%end shiptocontact%>
-<%if shiptophone%>
-<br>Tel: <%shiptophone%>
-<%end shiptophone%>
-<%if shiptofax%>
-<br>Fax: <%shiptofax%>
-<%end shiptofax%>
- </tr>
- </table>
- </td>
- </tr>
-
- <tr><td> </td></tr>
-
- <tr>
- <td colspan=2>
- <table width=100% border=1>
- <tr>
- <th width=17% align=left>RFQ #</th>
- <th width=17% align=left>Date</th>
- <th width=17% align=left>Required by</th>
- <th width=17% align=left>Contact</th>
- <th width=17% align=left>Shipping Point</th>
- <th width=15% align=left>Ship via</th>
- </tr>
-
- <tr>
- <td><%quonumber%></td>
- <td><%quodate%></td>
- <td><%reqdate%></td>
- <td><%employee%></td>
- <td><%shippingpoint%></td>
- <td><%shipvia%></td>
- </tr>
- </table>
- </td>
- </tr>
-
- <tr height="10"></tr>
-
- <tr>
- <td>Please provide price and delivery time for the following items:</td>
- </tr>
-
- <tr height="10"></tr>
-
- <tr>
- <td>
- <table width=100%>
- <tr>
-<!-- <th align=right>No.</th> -->
- <th align=left>Number</th>
- <th align=left>Description</th>
- <th>Qt'y</th>
- <th> </th>
- <th>Delivery</th>
- <th>Unit Price</th>
- <th>Extended</th>
- </tr>
-
-<%foreach number%>
- <tr valign=top>
-<!-- <td align=right><%runningnumber%>.</td>
-other per line item variables available <%reqdate%>
-adjust the colspan if you include this to shift subtotal one to the right
--->
- <td><%number%></td>
- <td><%description%></td>
- <td align=right><%qty%></td>
- <td><%unit%></td>
-
- </tr>
-<%end number%>
-
- <tr>
- <td colspan=7><hr noshade></td>
- </tr>
-
- </table>
- </td>
- </tr>
-
-<tr>
- <td>
- <table width=100%>
-<%if notes%>
- <tr valign=top>
- <td>Notes</td>
- <td><%notes%></td>
- </tr>
-<%end notes%>
-
- </table>
- </td>
-</tr>
-
-<tr><td> </td></tr>
-
-<tr>
- <td>
- <table width=100%>
- <tr valign=top>
- <td width=70%> </td>
-
- <td width=30%>
- X <hr noshade>
- </td>
- </tr>
- </table>
- </td>
-</tr>
-
-</table>
-
-</td>
-</tr>
-</table>
-
-</body>
-</html>
-
diff --git a/templates/print/Default/request_quotation.tex b/templates/print/Default/request_quotation.tex
deleted file mode 100644
index d8788b7be..000000000
--- a/templates/print/Default/request_quotation.tex
+++ /dev/null
@@ -1,150 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage{graphicx}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.7cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\pagestyle{myheadings}
-\thispagestyle{empty}
-
-\vspace*{-1.3cm}
-
-\parbox{\textwidth}{
- \parbox[b]{.42\textwidth}{
- <%company%>
-
- <%address%>
- }\hfill
- \begin{tabular}[b]{rr@{}}
- Telephone & <%tel%>\\
- Facsimile & <%fax%>
- \end{tabular}
-
- \rule[1.5ex]{\textwidth}{0.5pt}
-}
-
-\vspace*{0.5cm}
-
-\parbox[t]{1cm}{\hfill}
-\parbox[t]{.45\textwidth}{
-\textbf{To}
-\vspace{0.7cm}
-
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-\vspace{0.3cm}
-
-<%if contact%>
-<%contact%>
-<%end contact%>
-
-\vspace{0.2cm}
-
-<%if vendorphone%>
-Tel: <%vendorphone%>
-<%end vendorphone%>
-
-<%if vendorfax%>
-Fax: <%vendorfax%>
-<%end vendorfax%>
-
-<%email%>
-}
-\parbox[t]{.45\textwidth}{
-\textbf{Ship To}
-\vspace{0.7cm}
-
-<%shiptoname%>
-
-<%shiptostreet%>
-
-<%shiptozipcode%>
-
-<%shiptocity%>
-
-<%shiptocountry%>
-
-\vspace{0.3cm}
-
-<%if shiptocontact%>
-<%shiptocontact%>
-<%end shiptocontact%>
-
-<%if shiptophone%>
-Tel: <%shiptophone%>
-<%end shiptophone%>
-
-<%if shiptofax%>
-Fax: <%shiptofax%>
-<%end shiptofax%>
-
-<%shiptoemail%>
-}
-\hfill
-
-\vspace{1cm}
-
-\textbf{R E Q U E S T for Q U O T A T I O N}
-\hfill
-
-\vspace{1cm}
-
-\begin{tabularx}{\textwidth}{*{6}{|X}|} \hline
- \textbf{RFQ \#} & \textbf{Date} & \textbf{Required by} & \textbf{Contact} & \textbf{Shipping Point} & \textbf{Ship via} \\ [0.5ex]
- \hline
- <%quonumber%> & <%quodate%> & <%reqdate%> & <%employee%> & <%shippingpoint%> & <%shipvia%> \\
- \hline
-\end{tabularx}
-
-\vspace{1cm}
-
-Please provide price and delivery time for the following items:
-
-\vspace{1cm}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rllrr@{}}
- \textbf{Number} & \textbf{Description} & \textbf{Qt'y} & &
- \textbf{Delivery} & \textbf{Unit Price} & \textbf{Extended} \\
-<%foreach number%>
- <%number%> & <%description%> & <%qty%> & <%unit%> \\
-<%end number%>
-\end{tabular*}
-
-
-\parbox{\textwidth}{
-\rule{\textwidth}{2pt}
-
-\hfill
-
-<%if notes%>
- <%notes%>
-<%end if%>
-
-}
-
-\end{document}
-
diff --git a/templates/print/Default/sales_order.html b/templates/print/Default/sales_order.html
deleted file mode 100644
index 343955e28..000000000
--- a/templates/print/Default/sales_order.html
+++ /dev/null
@@ -1,212 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<table width=100%>
-<tr valign=bottom>
- <td width=10> </td>
- <td>
-
- <table width=100%>
- <tr>
- <td>
- <h4>
- <%company%>
- <br><%address%>
- </h4>
- </td>
-
- <td align=right>
- <h4>
- Telephone: <%tel%>
- <br>Facsimile: <%fax%>
- </h4>
- </td>
- </tr>
-
- <tr>
- <th colspan=3>
- <h4>S A L E S O R D E R</h4>
- </th>
- </tr>
-
- </table>
-
-
- <table width=100% callspacing=0 cellpadding=0>
-
- <tr>
- <td align=right>
- <table>
- <tr>
- <th align=right>Order Date</th><td width=10> </td><td><%orddate%></td>
- </tr>
-
- <tr>
- <th align=right>Required by</th><td width=10> </td><td><%reqdate%></td>
- </tr>
-
- <tr>
- <th align=right>Number</th><td> </td><td><%ordnumber%></td></tr>
- </tr>
-
- <tr>
- <td> </td>
- </tr>
- </td>
- </table>
- </tr>
-
- <tr>
- <td>
- <table width=100%>
- <tr bgcolor=000000>
- <th align=left><font color=ffffff>To:</th>
- <th align=left><font color=ffffff>Ship To:</th>
- </tr>
-
- <tr>
- <td><%name%>
- <br><%street%>
- <br><%zipcode%>
- <br><%city%>
- <br><%country%>
- </td>
-
- <td><%shiptoname%>
- <br><%shiptostreet%>
- <br><%shiptozipcode%>
- <br><%shiptocity%>
- <br><%shiptocountry%>
- </td>
- </tr>
- </table>
- </td>
- </tr>
-
- <tr>
- <td> </td>
- </tr>
-
- <tr>
- <td>
- <table width=100%>
- <tr bgcolor=000000>
-<!-- <th align=right><font color=ffffff>No.</th> -->
- <th align=left><font color=ffffff>Number</th>
- <th align=left><font color=ffffff>Description</th>
- <th><font color=ffffff>Qt'y</th>
- <th> </th>
- <th><font color=ffffff>Price</th>
- <th><font color=ffffff>Disc</th>
- <th><font color=ffffff>Amount</th>
- </tr>
-
-<%foreach number%>
- <tr valign=top>
-<!-- <td align=right><%runningnumber%>.</td>
-adjust the colspan if you include this to shift subtotal one to the right
--->
- <td><%number%></td>
- <td><%description%></td>
- <td align=right><%qty%></td>
- <td><%unit%></td>
- <td align=right><%sellprice%></td>
- <td align=right><%discount%></td>
- <td align=right><%linetotal%></td>
- </tr>
-<%end number%>
-
- <tr>
- <td colspan=7><hr noshade></td>
- </tr>
-
- <tr>
-<%if taxincluded%>
- <th colspan=5 align=right>Total</th>
- <td colspan=2 align=right><%ordtotal%></td>
-<%end taxincluded%>
-
-<%if not taxincluded%>
- <th colspan=5 align=right>Subtotal</th>
- <td colspan=2 align=right><%subtotal%></td>
-<%end taxincluded%>
- </tr>
-
-<%foreach tax%>
- <tr>
- <th colspan=5 align=right><%taxdescription%> on <%taxbase%> @ <%taxrate%> %</th>
- <td colspan=2 align=right><%tax%></td>
- </tr>
-<%end tax%>
-
- <tr>
- <td colspan=2> </td>
- <td colspan=5><hr noshade></td>
- </tr>
-
- <tr>
- <td colspan=3>Terms Net <b><%terms%></b> days</td>
- <th colspan=2 align=right>Total</th>
- <th colspan=2 align=right><%ordtotal%></th>
- </tr>
-<%if taxincluded%>
- <tr>
- <td colspan=3>Tax is included in Total</td>
- </tr>
-<%end taxincluded%>
-
- <tr>
- <td> </td>
- </tr>
-
- </table>
- </td>
- </tr>
-
-<tr>
- <td>
- <table width=100%>
- <tr valign=top>
-<%if notes%>
- <td>Notes</td>
- <td><pre><%notes%></pre></td>
-<%end notes%>
- <td align=right>
- All prices in <b><%currency%></b> Funds
- <br><%shippingpoint%>
- </td>
- </tr>
-
- </table>
- </td>
-</tr>
-
-<tr><td> </td></tr>
-
-<tr>
- <td>
- <table width=100%>
- <tr valign=top>
- <td><font size=-3>
- A 10% order cancellation fee will be applied for any special order
- products or products that have been customized, enhanced or
- upgraded at customers request.
- </font>
- </td>
- <td width=150>
- X <hr noshade>
- </td>
- </tr>
- </table>
- </td>
-</tr>
-
-</table>
-
-</td>
-</tr>
-</table>
-
-</body>
-</html>
-
diff --git a/templates/print/Default/sales_order.tex b/templates/print/Default/sales_order.tex
deleted file mode 100644
index 4e82e91eb..000000000
--- a/templates/print/Default/sales_order.tex
+++ /dev/null
@@ -1,123 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-
-\newsavebox{\hdr}
-\sbox{\hdr}{
- \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
- \parbox{\textwidth}{
- \parbox[b]{12cm}{
- <%company%>
-
- <%address%>}\hfill
- \begin{tabular}[b]{rr@{}}
- Telephone & <%tel%>\\
- Facsimile & <%fax%>
- \end{tabular}
-
- \rule[1.5ex]{\textwidth}{0.5pt}
- }
-}
-
-\fontfamily{cmss}\fontshape{n}\selectfont
-
-\markboth{<%company%>\hfill <%ordnumber%>}{\usebox{\hdr}}
-
-\pagestyle{myheadings}
-%\thispagestyle{empty} use this with letterhead paper
-
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\vspace*{2cm}
-
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-\vspace{3.5cm}
-
-\textbf{S A L E S} \parbox{0.3cm}{\hfill} \textbf{O R D E R}
-\hfill
-\begin{tabular}[t]{l@{\hspace{0.3cm}}l}
- \textbf{Order Date} & <%orddate%> \\
-<%if reqdate%>
- \textbf{Required by} & <%reqdate%> \\
-<%end reqdate%>
- \textbf{Number} & <%ordnumber%>
-\end{tabular}
-
-\vspace{1cm}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrrr@{}}
- \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
- \textbf{Unit} & \textbf{Price} & \textbf{Disc} & \textbf{Amount} \\
-<%foreach number%>
- <%number%> & <%description%> & <%qty%> &
- <%unit%> & <%sellprice%> & <%discount%> & <%linetotal%> \\
-<%end number%>
-\end{tabular*}
-
-
-\parbox{\textwidth}{
-\rule{\textwidth}{2pt}
-
-\vspace{0.2cm}
-
-\hfill
-\begin{tabularx}{7cm}{Xr@{}}
- \textbf{Subtotal} & \textbf{<%subtotal%>} \\
-<%foreach tax%>
- <%taxdescription%> on <%taxbase%> & <%tax%>\\
-<%end tax%>
- \hline
- \textbf{Total} & \textbf{<%ordtotal%>}\\
-\end{tabularx}
-
-\vspace{0.3cm}
-
-\hfill
- All prices in \textbf{<%currency%>} funds.
-
-\vspace{12pt}
-
-<%if notes%>
- <%notes%>
-<%end if%>
-
-}
-
-
-\renewcommand{\thefootnote}{\fnsymbol{footnote}}
-
-\footnotetext[1]{\tiny
-A 10\% order cancellation fee will be applied for any special order products or
-products that have been customized, enhanced or upgraded at customers request.
-Items which are non-returnable are indicated above.
-}
-
-\end{document}
-
diff --git a/templates/print/Default/sales_quotation.html b/templates/print/Default/sales_quotation.html
deleted file mode 100644
index a77d0c624..000000000
--- a/templates/print/Default/sales_quotation.html
+++ /dev/null
@@ -1,221 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<table width=100%>
-<tr valign=bottom>
- <td width=10> </td>
- <td>
-
- <table width=100%>
- <tr valign=top>
- <td>
- <h4>
- <%company%>
- <br><%address%>
- </h4>
- </td>
-
- <th><img src=http://localhost/lx-erp/lx-office-erp.png border=0 width=64 height=58></th>
-
- <td align=right>
- <h4>
- Tel: <%tel%>
- <br>Fax: <%fax%>
- </h4>
- </td>
- </tr>
-
-<tr><td colspan=3> </td></tr>
-
- <tr>
- <th colspan=3>
- <h4>Q U O T A T I O N</h4>
- </th>
- </tr>
-
- </table>
-
- <table width=100% callspacing=0 cellpadding=0>
-
- <tr>
- <td>
- <table width=100%>
-
- <tr valign=top>
- <td><%name%>
- <br><%street%>
- <br><%zipcode%>
- <br><%city%>
- <br><%country%>
-<br>
-<%if contact%>
-<br>Attn: <%contact%>
-<%end contact%>
-
-<%if customerphone%>
-<br>Tel: <%customerphone%>
-<%end customerphone%>
-
-<%if customerfax%>
-<br>Fax: <%customerfax%>
-<%end customerfax%>
-
-<%if email%>
-<br><%email%>
-<%end email%>
- </td>
-
- </tr>
- </table>
- </td>
- </tr>
-
- <tr><td> </td></tr>
-
- <tr>
- <td colspan=2>
- <table width=100% border=1>
- <tr>
- <th width=17% align=left nowrap>Number</th>
- <th width=17% align=left>Date</th>
- <th width=17% align=left>Valid until</th>
- <th width=17% align=left nowrap>Contact</th>
- <th width=17% align=left nowrap>Shipping Point</th>
- <th width=15% align=left nowrap>Ship via</th>
- </tr>
-
- <tr>
- <td><%quonumber%></td>
- <td><%quodate%></td>
- <td><%reqdate%></td>
- <td><%employee%></td>
- <td><%shippingpoint%></td>
- <td><%shipvia%></td>
- </tr>
- </table>
- </td>
- </tr>
-
- <tr>
- <td> </td>
- </tr>
-
- <tr>
- <td>
- <table width=100%>
- <tr bgcolor=000000>
- <th align=right><font color=ffffff>No.</th>
- <th align=left><font color=ffffff>Number</th>
- <th align=left><font color=ffffff>Description</th>
- <th><font color=ffffff>Qt'y</th>
- <th> </th>
- <th><font color=ffffff>Price</th>
- <th><font color=ffffff>Disc</th>
- <th><font color=ffffff>Amount</th>
- </tr>
-
-<%foreach number%>
- <tr valign=top>
- <td align=right><%runningnumber%></td>
-
- <td><%number%></td>
- <td><%description%></td>
- <td align=right><%qty%></td>
- <td><%unit%></td>
- <td align=right><%sellprice%></td>
- <td align=right><%discount%></td>
- <td align=right><%linetotal%></td>
- </tr>
-<%end number%>
-
- <tr>
- <td colspan=8><hr noshade></td>
- </tr>
-
- <tr>
-<%if taxincluded%>
- <th colspan=6 align=right>Total</th>
- <td colspan=2 align=right><%invtotal%></td>
-<%end taxincluded%>
-
-<%if not taxincluded%>
- <th colspan=6 align=right>Subtotal</th>
- <td colspan=2 align=right><%subtotal%></td>
-<%end taxincluded%>
- </tr>
-
-<%foreach tax%>
- <tr>
- <th colspan=6 align=right><%taxdescription%> on <%taxbase%> @ <%taxrate%> %</th>
- <td colspan=2 align=right><%tax%></td>
- </tr>
-<%end tax%>
-
- <tr>
- <td colspan=4> </td>
- <td colspan=4><hr noshade></td>
- </tr>
-
- <tr>
- <td colspan=4>
-<%if terms%>
- Terms Net <b><%terms%></b> days
-<%end terms%>
- </td>
- <th colspan=2 align=right>Total</th>
- <th colspan=2 align=right><%quototal%></th>
- </tr>
-
- <tr>
- <td> </td>
- </tr>
-
- </table>
- </td>
- </tr>
-
-<tr>
- <td>
- <table width=100%>
- <tr valign=top>
-<%if notes%>
- <td>Notes</td>
- <td><%notes%></td>
-<%end notes%>
- <td align=right>
- All prices in <b><%currency%></b> Funds
- </td>
- </tr>
-
- </table>
- </td>
-</tr>
-
-<tr><td> </td></tr>
-
-<tr>
- <td>
- <table width=100%>
- <tr valign=top>
- <td width=60%><font size=-3>
- Special order items are subject to a 10% cancellation fee.
- </font>
- </td>
- <td width=40%>
- X <hr noshade>
- </td>
- </tr>
- </table>
- </td>
-</tr>
-
-</table>
-
-</td>
-</tr>
-</table>
-
-</body>
-</html>
-
-
diff --git a/templates/print/Default/sales_quotation.tex b/templates/print/Default/sales_quotation.tex
deleted file mode 100644
index 35d435753..000000000
--- a/templates/print/Default/sales_quotation.tex
+++ /dev/null
@@ -1,136 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage{graphicx}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.7cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\pagestyle{myheadings}
-\thispagestyle{empty}
-
-\vspace*{-1.3cm}
-
-\parbox{\textwidth}{
- \parbox[b]{.42\textwidth}{
- <%company%>
-
- <%address%>
- }
- \parbox[b]{.2\textwidth}{
- \includegraphics[scale=0.3]{sql-ledger}
- }\hfill
- \begin{tabular}[b]{rr@{}}
- Telephone & <%tel%>\\
- Facsimile & <%fax%>
- \end{tabular}
-
- \rule[1.5ex]{\textwidth}{0.5pt}
-}
-
-\vspace*{0.5cm}
-
-\parbox[t]{1cm}{\hfill}
-\parbox[t]{.45\textwidth}{
-
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-\vspace{0.3cm}
-
-<%if contact%>
-<%contact%>
-<%end contact%>
-
-\vspace{0.2cm}
-
-<%if customerphone%>
-Tel: <%customerphone%>
-<%end customerphone%>
-
-<%if customerfax%>
-Fax: <%customerfax%>
-<%end customerfax%>
-
-<%email%>
-}
-
-\vspace{1cm}
-
-\textbf{Q U O T A T I O N}
-\hfill
-
-\vspace{1cm}
-
-\begin{tabularx}{\textwidth}{*{6}{|X}|} \hline
- \textbf{Quotation \#} & \textbf{Date} & \textbf{Valid until} & \textbf{Contact} & \textbf{Shipping Point} & \textbf{Ship via} \\ [0.5ex]
- \hline
- <%quonumber%> & <%quodate%> & <%reqdate%> & <%employee%> & <%shippingpoint%> & <%shipvia%> \\
- \hline
-\end{tabularx}
-
-\vspace{1cm}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rlrrr@{}}
- \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
- \textbf{Unit} & \textbf{Price} & \textbf{Disc} & \textbf{Amount} \\
-<%foreach number%>
- <%number%> & <%description%> & <%qty%> &
- <%unit%> & <%sellprice%> & <%discount%> & <%linetotal%> \\
-<%end number%>
-\end{tabular*}
-
-
-\parbox{\textwidth}{
-\rule{\textwidth}{2pt}
-
-\vspace{0.2cm}
-
-\hfill
-\begin{tabularx}{7cm}{Xr@{}}
- Subtotal & <%subtotal%> \\
-<%foreach tax%>
- <%taxdescription%> on <%taxbase%> & <%tax%>\\
-<%end tax%>
- \hline
- Total & <%quototal%>\\
-\end{tabularx}
-
-\vspace{0.3cm}
-
-\hfill
- All prices in \textbf{<%currency%>}.
-
-\vspace{12pt}
-
-<%if notes%>
- <%notes%>
-<%end if%>
-
-}
-
-\vfill
-
-\end{document}
-
diff --git a/templates/print/Default/statement.html b/templates/print/Default/statement.html
deleted file mode 100644
index 441e6e0d1..000000000
--- a/templates/print/Default/statement.html
+++ /dev/null
@@ -1,121 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<table width=100%>
- <tr>
- <td width=10> </td>
- <td>
- <table width=100%>
- <tr>
- <td>
- <h4>
- <%company%>
- <br><%address%>
- </h4>
- </td>
- <th><img src=http://www.sql-ledger.org/images/sql-ledger.png border=0 width=64 height=58></th>
- <td align=right>
- <h4>
- Tel: <%tel%>
- <br>Fax: <%fax%>
- </h4>
- </td>
- </tr>
- <tr>
- <th colspan=3><h4>S T A T E M E N T</h4></th>
- </tr>
- <tr>
- <td colspan=3 align=right><%statementdate%></td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <table width=100%>
- <tr valign=top>
- <td><%name%>
- <br><%street%>
- <br><%zipcode%>
- <br><%city%>
- <br><%country%>
- <br>
-<%if customerphone%>
- <br>Tel: <%customerphone%>
-<%end customerphone%>
-<%if customerfax%>
- <br>Fax: <%customerfax%>
-<%end customerfax%>
-<%if email%>
- <br><%email%>
-<%end email%>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- <tr height=10></tr>
- <tr>
- <td> </td>
- <td>
- <table width=100%>
- <tr>
- <th align=left>Invoice #</th>
- <th width=15%>Date</th>
- <th width=15%>Due</th>
- <th width=10%>Current</th>
- <th width=10%>30</th>
- <th width=10%>60</th>
- <th width=10%>90+</th>
- </tr>
-<%foreach invnumber%>
- <tr>
- <td><%invnumber%></td>
- <td><%invdate%></td>
- <td><%duedate%></td>
- <td align=right><%c0%></td>
- <td align=right><%c30%></td>
- <td align=right><%c60%></td>
- <td align=right><%c90%></td>
- </tr>
-<%end invnumber%>
- <tr>
- <td colspan=7><hr size=1></td>
- </tr>
- <tr>
- <td> </td>
- <td> </td>
- <td> </td>
- <th align=right><%c0total%></td>
- <th align=right><%c30total%></td>
- <th align=right><%c60total%></td>
- <th align=right><%c90total%></td>
- </tr>
- </table>
- </td>
- </tr>
- <tr height=10></tr>
- <tr>
- <td> </td>
- <td align=right>
- <table width=50%>
- <tr>
- <th>Total Outstanding</th>
- <th align=right><%total%></th>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td><hr noshade></td>
- </tr>
- <tr>
- <td> </td>
- <td>Please make check payable to <b><%company%></b>.
- </td>
- </tr>
- <tr height=20></tr>
-</table>
-
diff --git a/templates/print/Default/statement.tex b/templates/print/Default/statement.tex
deleted file mode 100644
index 9f611b881..000000000
--- a/templates/print/Default/statement.tex
+++ /dev/null
@@ -1,107 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-
-\newsavebox{\hdr}
-\sbox{\hdr}{
- \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
- \parbox{\textwidth}{
- \parbox[b]{12cm}{
- <%company%>
-
- <%address%>}\hfill
- \begin{tabular}[b]{rrr@{}}
- Tel & <%tel%>\\
- Fax & <%fax%>
- \end{tabular}
-
- \rule[1.5ex]{\textwidth}{0.5pt}
- }
-}
-
-\fontfamily{cmss}\fontshape{n}\selectfont
-
-\markboth{<%company%>\hfill <%statementdate%>}{\usebox{\hdr}}
-
-\pagestyle{myheadings}
-%\thispagestyle{empty} use this with letterhead paper
-
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\vspace*{1.5cm}
-
-\parbox[t]{1cm}{\hfill}
-\parbox[t]{10.5cm}{
-
-<%name%>
-
-<%street%>
-
-<%zipcode%>
-
-<%city%>
-
-<%country%>
-
-}
-\parbox[t]{7.5cm}{
-<%if customerphone%>
-Tel: <%customerphone%>
-<%end customerphone%>
-
-<%if customerfax%>
-Fax: <%customerfax%>
-<%end customerfax%>
-
-<%email%>
-}
-\hfill
-
-\vspace{1cm}
-
-\textbf{S T A T E M E N T} \hfill \textbf{<%statementdate%>}
-
-\vspace{2cm}
-
-\begin{tabular*}{\textwidth}{@{}l@{\extracolsep\fill}ccrrrr@{}}
- \textbf{Invoice \#} & \textbf{Date} & \textbf{Due} &
- \textbf{Current} & \textbf{30} & \textbf{60} & \textbf{90+} \\
-<%foreach invnumber%>
- <%invnumber%> & <%invdate%> & <%duedate%> &
- <%c0%> & <%c30%> & <%c60%> & <%c90%> \\
-<%end invnumber%>
-\textbf{Subtotal} & & & <%c0total%> & <%c30total%> & <%c60total%> & <%c90total%>
-\end{tabular*}
-\rule{\textwidth}{1pt}
-
-\vspace{0.5cm}
-
-\hfill
-\begin{tabularx}{7cm}{Xr@{}}
- \textbf{Total outstanding} & <%total%>
-\end{tabularx}
-
-\vfill
-
-Please make check payable to <%company%>
-
-\end{document}
-
diff --git a/templates/print/German/bwa.html b/templates/print/German/bwa.html
deleted file mode 100644
index 91907d8fe..000000000
--- a/templates/print/German/bwa.html
+++ /dev/null
@@ -1,582 +0,0 @@
-<body>
-<style type="text/css">
-<!--
-/* Allgemeine Schriftdefinition */
-th,td {
- font-family: Arial, Verdana, Helvetica, Sans-serif;
- font-size:small;
-}
-
-@page {
- size: landscape;
- margin: 0.5cm;
-}
-
-/* Definition Tabellenueberschrift */
-
-.left { text-align:left; }
-.center { text-align:center; }
-.right { text-align:right; }
-
-tr.headline { border:0; }
-tr.headline td { border:0; }
-h1 { font-size:120%; }
-h2 { font-size:100%; }
-
-/* Tabellenkopf */
-th {
- font-weight: bold;
- border-bottom: solid thin black;
- padding:0 10px;
- text-align:right;
-}
-
-th.left { border-left: solid thin black; }
-th.right { border-right: solid thin black; }
-
-.querkopf th.right { text-align:center; }
-.querkopf th {
- border-top: solid thin black;
- border-bottom:0;
-}
-
-/* Tabelleninhalt */
-td {
- text-align:right;
- padding:0 0.5em;
-}
-td.left { border-left: solid thin black; }
-td.right { border-right: solid thin black; }
-
-
-/* jede zweite Zeile grau hinterlegen */
-tr.grey {
- background:#f0f0f0;
-}
-
-/* letzte Zeile in der Tabelle */
-#last td{ border-bottom: solid thin black; }
-
-/* Zwischensumme/-ueberschriften */
-tr.subtotal td { font-weight: bold; }
-
-/* Fusszeile unter der Tabelle */
-td.footer {
- text-align:right;
- font-size:smaller;
-}
-//-->
-</style>
-
-<table border=0 cellpadding=0 cellspacing=0>
-<tr class="headline">
- <td class="left"><%company%></td>
- <td class=center colspan="9">
- <h1>Kurzfristige Erfolgsrechnung <%period%></h1>
- <h2>SKR3 BWA</h2>
- </td>
- <td class="right">Blatt 1</td>
-</tr>
-
-
-</tr>
-<tr class="querkopf">
- <th class="left"> </th>
- <th class="center" colspan="5">Im Betrachtungszeitraum</th>
- <th class="right" colspan="5">Kumuliert seit Jahresanfang</th>
-</tr>
-
-<tr>
- <th class="left">Bezeichnung</th>
- <th>Wert</th>
- <th>% Ges.- Leistg.</th>
- <th>% Ges.- Kosten</th>
- <th>% Pers.- Kosten</th>
- <th>Aufschlag</th>
- <th>Wert</th>
- <th>% Ges.- Leistg.</th>
- <th>% Ges.- Kosten</th>
- <th>% Pers.- Kosten</th>
- <th class="right">Aufschlag</th>
-</tr>
-
-<tr class="white"><td class="left right" colspan="11"> </td></tr>
-
-<tr class="grey">
- <td class="left"><nobr>Umsatzerlöse</nobr></td>
- <td><nobr><%jetzt1%></nobr></td>
- <td><nobr><%jetztgl1%></nobr></td>
- <td></td>
- <td></td>
- <td></td>
- <td><nobr><%kumm1%></nobr></td>
- <td><nobr><%kummgl1%></nobr></td>
- <td></td>
- <td></td>
- <td class="right"> </td>
-</tr>
-
-<tr class="white">
- <td class="left"><nobr>Best.Verdg. FE/UE</nobr></td>
- <td><nobr><%jetzt2%></nobr></td>
- <td><nobr><%jetztgl2%></nobr></td>
- <td></td>
- <td></td>
- <td></td>
- <td><nobr><%kumm2%></nobr></td>
- <td><nobr><%kummgl2%></nobr></td>
- <td></td>
- <td></td>
- <td class="right"> </td>
-</tr>
-
-<tr class="grey">
- <td class="left"><nobr>Akt.Eigenleistungen</nobr></td>
- <td><nobr><%jetzt3%></nobr></td>
- <td><nobr><%jetztgl3%></nobr></td>
- <td></td>
- <td></td>
- <td></td>
- <td><nobr><%kumm3%></nobr></td>
- <td><nobr><%kummgl3%></nobr></td>
- <td></td>
- <td></td>
- <td class="right"> </td>
-</tr>
-
-<tr class="white"><td class="left right" colspan="11"> </td></tr>
-
-<tr class="grey subtotal">
- <td class="left"><nobr>Gesamtleistung</nobr></td>
- <td><nobr><%jetztgesamtleistung%></nobr></td>
- <td><nobr><%jetztglgesamtleistung%></nobr></td>
- <td><nobr><%jetztgkgesamtleistung%></nobr></td>
- <td><nobr><%jetztpkgesamtleistung%></nobr></td>
- <td></td>
- <td><nobr><%kummgesamtleistung%></nobr></td>
- <td><nobr><%kummglgesamtleistung%></nobr></td>
- <td><nobr><%kummgkgesamtleistung%></nobr></td>
- <td><nobr><%kummpkgesamtleistung%></nobr></td>
- <td class="right"> </td>
-</tr>
-
-<tr class="white"><td class="left right" colspan="11"> </td></tr>
-
-<tr class="grey">
- <td class="left"><nobr>Mat./Wareneinkauf</nobr></td>
- <td><nobr><%jetzt4%></nobr></td>
- <td><nobr><%jetztgl4%></nobr></td>
- <td><nobr><%jetztgk4%></nobr></td>
- <td><nobr><%jetztpk4%></nobr></td>
- <td><nobr><%jetztauf4%></nobr></td>
- <td><nobr><%kumm4%></nobr></td>
- <td><nobr><%kummgl4%></nobr></td>
- <td><nobr><%kummgk4%></nobr></td>
- <td><nobr><%kummpk4%></nobr></td>
- <td class="right"><nobr><%kummauf4%></nobr> </td>
-</tr>
-
-<tr class="white"><td class="left right" colspan="11"> </td></tr>
-
-<tr class="grey subtotal">
- <td class="left"><nobr>Rohertrag</nobr></td>
- <td><nobr><%jetztrohertrag%></nobr></td>
- <td><nobr><%jetztglrohertrag%></nobr></td>
- <td><nobr><%jetztgkrohertrag%></nobr></td>
- <td><nobr><%jetztpkrohertrag%></nobr></td>
- <td><nobr><%jetztaufrohertrag%></nobr></td>
- <td><nobr><%kummrohertrag%></nobr></td>
- <td><nobr><%kummglrohertrag%></nobr></td>
- <td><nobr><%kummgkrohertrag%></nobr></td>
- <td><nobr><%kummpkrohertrag%></nobr></td>
- <td class="right"><nobr><%kummaufrohertrag%></nobr> </td>
-</tr>
-
-<tr class="white"><td class="left right" colspan="11"> </td></tr>
-
-<tr class="grey">
- <td class="left"><nobr>So.betr.Erlöse</nobr></td>
- <td><nobr><%jetzt5%></nobr></td>
- <td><nobr><%jetztgl5%></nobr></td>
- <td><nobr><%jetztgk5%></nobr></td>
- <td><nobr><%jetztpk5%></nobr></td>
- <td></td>
- <td><nobr><%kumm5%></nobr></td>
- <td><nobr><%kummgl5%></nobr></td>
- <td><nobr><%kummgk5%></nobr></td>
- <td><nobr><%kummpk5%></nobr></td>
- <td class="right"> </td>
-</tr>
-
-<tr class="white"><td class="left right" colspan="11"> </td></tr>
-
-<tr class="grey subtotal">
- <td class="left"><nobr>Betriebl. Rohertrag</nobr></td>
- <td><nobr><%jetztbetriebrohertrag%></nobr></td>
- <td><nobr><%jetztglbetriebrohertrag%></nobr></td>
- <td><nobr><%jetztgkbetriebrohertrag%></nobr></td>
- <td><nobr><%jetztpkbetriebrohertrag%></nobr></td>
- <td><nobr><%jetztaufbetriebrohertrag%></nobr></td>
- <td><nobr><%kummbetriebrohertrag%></nobr></td>
- <td><nobr><%kummglbetriebrohertrag%></nobr></td>
- <td><nobr><%kummgkbetriebrohertrag%></nobr></td>
- <td><nobr><%kummpkbetriebrohertrag%></nobr></td>
- <td
-class="right"><nobr><%kummaufbetriebrohertrag%></nobr> </td>
-</tr>
-
-<tr class="white"><td class="left right" colspan="11"> </td></tr>
-
-<tr class="grey subtotal">
- <td class="left">Kostenarten:</td>
- <td class="right" colspan="10"> </td>
-</tr>
-
-<tr class="white">
- <td class="left"><nobr>Personalkosten</nobr></td>
- <td><nobr><%jetzt10%></nobr></td>
- <td><nobr><%jetztgl10%></nobr></td>
- <td><nobr><%jetztgk10%></nobr></td>
- <td><nobr><%jetztpk10%></nobr></td>
- <td></td>
- <td><nobr><%kumm10%></nobr></td>
- <td><nobr><%kummgl10%></nobr></td>
- <td><nobr><%kummgk10%></nobr></td>
- <td><nobr><%kummpk10%></nobr></td>
- <td class="right"> </td>
-</tr>
-
-<tr class="grey">
- <td class="left"><nobr>Raumkosten</nobr></td>
- <td><nobr><%jetzt11%></nobr></td>
- <td><nobr><%jetztgl11%></nobr></td>
- <td><nobr><%jetztgk11%></nobr></td>
- <td><nobr><%jetztpk11%></nobr></td>
- <td></td>
- <td><nobr><%kumm11%></nobr></td>
- <td><nobr><%kummgl11%></nobr></td>
- <td><nobr><%kummgk11%></nobr></td>
- <td><nobr><%kummpk11%></nobr></td>
- <td class="right"> </td>
-</tr>
-
-<tr class="white">
- <td class="left"><nobr>Betriebl.Steuern</nobr></td>
- <td><nobr><%jetzt12%></nobr></td>
- <td><nobr><%jetztgl12%></nobr></td>
- <td><nobr><%jetztgk12%></nobr></td>
- <td><nobr><%jetztpk12%></nobr></td>
- <td></td>
- <td><nobr><%kumm12%></nobr></td>
- <td><nobr><%kummgl12%></nobr></td>
- <td><nobr><%kummgk12%></nobr></td>
- <td><nobr><%kummpk12%></nobr></td>
- <td class="right"> </td>
-</tr>
-
-<tr class="grey">
- <td class="left"><nobr>Versich./Beiträge</nobr></td>
- <td><nobr><%jetzt13%></nobr></td>
- <td><nobr><%jetztgl13%></nobr></td>
- <td><nobr><%jetztgk13%></nobr></td>
- <td><nobr><%jetztpk13%></nobr></td>
- <td></td>
- <td><nobr><%kumm13%></nobr></td>
- <td><nobr><%kummgl13%></nobr></td>
- <td><nobr><%kummgk13%></nobr></td>
- <td><nobr><%kummpk13%></nobr></td>
- <td class="right"> </td>
-</tr>
-
-<tr class="grey">
- <td class="left"><nobr>Kfz-Kosten (o.St.)</nobr></td>
- <td><nobr><%jetzt14%></nobr></td>
- <td><nobr><%jetztgl14%></nobr></td>
- <td><nobr><%jetztgk14%></nobr></td>
- <td><nobr><%jetztpk14%></nobr></td>
- <td></td>
- <td><nobr><%kumm14%></nobr></td>
- <td><nobr><%kummgl14%></nobr></td>
- <td><nobr><%kummgk14%></nobr></td>
- <td><nobr><%kummpk14%></nobr></td>
- <td class="right"> </td>
-</tr>
-
-<tr class="white">
- <td class="left"><nobr>Werbe-/Reisekosten</nobr></td>
- <td><nobr><%jetzt15%></nobr></td>
- <td><nobr><%jetztgl15%></nobr></td>
- <td><nobr><%jetztgk15%></nobr></td>
- <td><nobr><%jetztpk15%></nobr></td>
- <td></td>
- <td><nobr><%kumm15%></nobr></td>
- <td><nobr><%kummgl15%></nobr></td>
- <td><nobr><%kummgk15%></nobr></td>
- <td><nobr><%kummpk15%></nobr></td>
- <td class="right"> </td>
-</tr>
-
-<tr class="grey">
- <td class="left"><nobr>Kosten Warenabgabe</nobr></td>
- <td><nobr><%jetzt16%></nobr></td>
- <td><nobr><%jetztgl16%></nobr></td>
- <td><nobr><%jetztgk16%></nobr></td>
- <td><nobr><%jetztpk16%></nobr></td>
- <td></td>
- <td><nobr><%kumm16%></nobr></td>
- <td><nobr><%kummgl16%></nobr>
-</td>
- <td><nobr><%kummgk16%></nobr></td>
- <td><nobr><%kummpk16%></nobr></td>
- <td class="right"> </td>
-</tr>
-
-<tr class="white">
- <td class="left"><nobr>Abschreibungen</nobr></td>
- <td><nobr><%jetzt17%></nobr></td>
- <td><nobr><%jetztgl17%></nobr></td>
- <td><nobr><%jetztgk17%></nobr></td>
- <td><nobr><%jetztpk17%></nobr></td>
- <td></td>
- <td><nobr><%kumm17%></nobr></td>
- <td><nobr><%kummgl17%></nobr></td>
- <td><nobr><%kummgk17%></nobr></td>
- <td><nobr><%kummpk17%></nobr></td>
- <td class="right"> </td>
-</tr>
-
-<tr class="grey">
- <td class="left"><nobr>Reparatur/Instandh.</nobr></td>
- <td><nobr><%jetzt18%></nobr></td>
- <td><nobr><%jetztgl18%></nobr></td>
- <td><nobr><%jetztgk18%></nobr></td>
- <td><nobr><%jetztpk18%></nobr></td>
- <td></td>
- <td><nobr><%kumm18%></nobr></td>
- <td><nobr><%kummgl18%></nobr></td>
- <td><nobr><%kummgk18%></nobr></td>
- <td><nobr><%kummpk18%></nobr></td>
- <td class="right"> </td>
-</tr>
-
-<tr class="white">
- <td class="left"><nobr>Sonstige Kosten</nobr></td>
- <td><nobr><%jetzt20%></nobr></td>
- <td><nobr><%jetztgl20%></nobr></td>
- <td><nobr><%jetztgk20%></nobr></td>
- <td><nobr><%jetztpk20%></nobr></td>
- <td></td>
- <td><nobr><%kumm20%></nobr></td>
- <td><nobr><%kummgl20%></nobr></td>
- <td><nobr><%kummgk20%></nobr></td>
- <td><nobr><%kummpk20%></nobr></td>
- <td class="right"> </td>
-</tr>
-
-<tr class="grey subtotal">
- <td class="left"><nobr>Gesamtkosten</nobr></td>
- <td><nobr><%jetztgesamtkosten%></nobr></td>
- <td><nobr><%jetztglgesamtkosten%></nobr></td>
- <td><nobr><%jetztgkgesamtkosten%></nobr></td>
- <td><nobr><%jetztpkgesamtkosten%></nobr></td>
- <td></td>
- <td><nobr><%kummgesamtkosten%></nobr></td>
- <td><nobr><%kummglgesamtkosten%></nobr></td>
- <td><nobr><%kummgkgesamtkosten%></nobr></td>
- <td><nobr><%kummpkgesamtkosten%></nobr></td>
- <td class="right"> </td>
-</tr>
-
-<tr class="white"><td class="left right" colspan="11"> </td></tr>
-
-
-<tr class="grey subtotal">
-<td class="left"><nobr>Betriebsergebnis</nobr></td>
- <td><nobr><%jetztbetriebsergebnis%></nobr></td>
- <td><nobr><%jetztglbetriebsergebnis%></nobr>
-</td>
- <td><nobr><%jetztgkbetriebsergebnis%></nobr></td>
- <td><nobr><%jetztpkbetriebsergebnis%></nobr></td>
- <td></td>
- <td><nobr><%kummbetriebsergebnis%></nobr></td>
- <td><nobr><%kummglbetriebsergebnis%></nobr>
-</td>
- <td><nobr><%kummgkbetriebsergebnis%></nobr></td>
- <td><nobr><%kummpkbetriebsergebnis%></nobr></td>
- <td class="right"> </td>
- </tr>
-
-<tr class="white"><td class="left right" colspan="11"> </td></tr>
-
-<tr class="grey">
- <td class="left"><nobr>Zinsaufwand</nobr></td>
- <td><nobr><%jetzt30%></nobr></td>
- <td><nobr><%jetztgl30%></nobr></td>
- <td><nobr><%jetztgk30%></nobr></td>
- <td><nobr><%jetztpk30%></nobr></td>
- <td></td>
- <td><nobr><%kumm30%></nobr></td>
- <td><nobr><%kummgl30%></nobr></td>
- <td><nobr><%kummgk30%></nobr></td>
- <td><nobr><%kummpk30%></nobr></td>
- <td class="right"> </td>
-</tr>
-
-<tr class="white">
- <td class="left"><nobr>Übrige Steuern</nobr></td>
- <td><nobr><%jetzt19%></nobr></td>
- <td><nobr><%jetztgl19%></nobr></td>
- <td><nobr><%jetztgk19%></nobr></td>
- <td><nobr><%jetztpk19%></nobr></td>
- <td></td>
- <td><nobr><%kumm19%></nobr></td>
- <td><nobr><%kummg191%></nobr></td>
- <td><nobr><%kummgk19%></nobr></td>
- <td><nobr><%kummpk19%></nobr></td>
- <td class="right"> </td>
-</tr>
-
-<tr class="grey">
- <td class="left"><nobr>Sonst. neutr. Aufwand</nobr></td>
- <td><nobr><%jetzt31%></nobr></td>
- <td><nobr><%jetztgl31%></nobr></td>
- <td><nobr><%jetztgk31%></nobr></td>
- <td><nobr><%jetztpk31%></nobr></td>
- <td></td>
- <td><nobr><%kumm31%></nobr></td>
- <td><nobr><%kummgl31%></nobr></td>
- <td><nobr><%kummgk31%></nobr></td>
- <td><nobr><%kummpk31%></nobr></td>
- <td class="right"> </td>
-</tr>
-
-<tr class="white subtotal">
-<td class="left"><nobr>Neutraler Aufwand</nobr></td>
- <td><nobr><%jetztneutraleraufwand%></nobr></td>
- <td><nobr><%jetztglneutraleraufwand%></nobr></td>
- <td><nobr><%jetztgkneutraleraufwand%></nobr></td>
- <td><nobr><%jetztpkneutraleraufwand%></nobr></td>
- <td></td>
- <td><nobr><%kummneutraleraufwand%></nobr></td>
- <td><nobr><%kummglneutraleraufwand%></nobr></td>
- <td><nobr><%kummgkneutraleraufwand%></nobr></td>
- <td><nobr><%kummpkneutraleraufwand%></nobr></td>
- <td class="right"> </td>
-</tr>
-
-<tr class="grey"><td class="left right" colspan="11"> </td></tr>
-
-<tr class="white">
- <td class="left"><nobr>Zinserträge</nobr></td>
- <td><nobr><%jetzt32%></nobr></td>
- <td><nobr><%jetztgl32%></nobr></td>
- <td><nobr><%jetztgk32%></nobr></td>
- <td><nobr><%jetztpk32%></nobr></td>
- <td></td>
- <td><nobr><%kumm32%></nobr></td>
- <td><nobr><%kummgl32%></nobr></td>
- <td><nobr><%kummgk32%></nobr></td>
- <td><nobr><%kummpk32%></nobr></td>
- <td class="right"> </td>
-</tr>
-
-<tr class="grey">
- <td class="left"><nobr>Sonst. neutr. Ertr.</nobr></td>
- <td><nobr><%jetzt33%></nobr></td>
- <td><nobr><%jetztgl33%></nobr></td>
- <td><nobr><%jetztgk33%></nobr></td>
- <td><nobr><%jetztpk33%></nobr></td>
- <td></td>
- <td><nobr><%kumm33%></nobr></td>
- <td><nobr><%kummgl33%></nobr></td>
- <td><nobr><%kummgk33%></nobr></td>
- <td><nobr><%kummpk33%></nobr></td>
- <td class="right"> </td>
-</tr>
-
-<tr class="white">
- <td class="left"><nobr>Verr.kalk.Kosten</nobr></td>
- <td><nobr><%jetzt34%></nobr></td>
- <td><nobr><%jetztgl34%></nobr>
- <td><nobr><%jetztgk34%></nobr></td>
- <td><nobr><%jetztpk34%></nobr></td>
- <td></td>
- <td><nobr><%kumm34%></nobr></td>
- <td><nobr><%kummgl34%></nobr></td>
- <td><nobr><%kummgk34%></nobr></td>
- <td><nobr><%kummpk34%></nobr></td>
- <td class="right"> </td>
-</tr>
-
-<tr class="grey subtotal">
- <td class="left"><nobr>Neutraler Ertrag</nobr></td>
- <td><nobr><%jetztneutralerertrag%></nobr></td>
- <td><nobr><%jetztglneutralerertrag%></nobr></td>
- <td><nobr><%jetztgkneutralerertrag%></nobr></td>
- <td><nobr><%jetztpkneutralerertrag%></nobr></td>
- <td></td>
- <td><nobr><%kummneutralerertrag%></nobr></td>
- <td><nobr><%kummglneutralerertrag%></nobr></td>
- <td><nobr><%kummgkneutralerertrag%></nobr></td>
- <td><nobr><%kummpkneutralerertrag%></nobr></td>
- <td class="right"> </td>
-</tr>
-
-<tr class="white"><td class="left right" colspan="11"> </td></tr>
-
-<tr class="grey subtotal">
- <td class="left"><nobr>Ergebnis vor Steuern</nobr></td>
- <td><nobr><%jetztergebnisvorsteuern%></nobr></td>
- <td><nobr><%jetztglergebnisvorsteuern%></nobr></td>
- <td><nobr><%jetztgkergebnisvorsteuern%></nobr></td>
- <td><nobr><%jetztpkergebnisvorsteuern%></nobr></td>
- <td></td>
- <td><nobr><%kummergebnisvorsteuern%></nobr></td>
- <td><nobr><%kummglergebnisvorsteuern%></nobr></td>
- <td><nobr><%kummgkergebnisvorsteuern%></nobr></td>
- <td><nobr><%kummpkergebnisvorsteuern%></nobr></td>
- <td class="right"> </td>
-</tr>
-
-<tr class="white"><td class="left right" colspan="11"> </td></tr>
-
-<tr class="grey">
- <td class="left"><nobr>Steuern Eink.u.Ertr.</nobr></td>
- <td><nobr><%jetzt35%></nobr></td>
- <td><nobr><%jetztgl35%></nobr></td>
- <td><nobr><%jetztgk35%></nobr></td>
- <td><nobr><%jetztpk35%></nobr></td>
- <td></td>
- <td><nobr><%kumm35%></nobr></td>
- <td><nobr><%kummgl35%></nobr></td>
- <td><nobr><%kummgk35%></nobr></td>
- <td><nobr><%kummpk35%></nobr></td>
- <td class="right"> </td>
-</tr>
-
-<tr class="white"><td class="left right" colspan="11"> </td></tr>
-
-<tr class="grey subtotal">
- <td class="left"><nobr>Vorläufiges Ergebnis</nobr></td>
- <td><nobr><%jetztergebnis%></nobr></td>
- <td><nobr><%jetztglergebnis%></nobr></td>
- <td><nobr><%jetztgkergebnis%></nobr></td>
- <td><nobr><%jetztpkergebnis%></nobr></td>
- <td></td>
- <td><nobr><%kummergebnis%></nobr></td>
- <td><nobr><%kummglergebnis%></nobr></td>
- <td><nobr><%kummgkergebnis%></nobr></td>
- <td><nobr><%kummpkergebnis%></nobr></td>
- <td class="right"> </td>
-</tr>
-
-<tr class="white" id=last><td class="left right"
-colspan="11"> </td></tr>
-
-<tr>
- <td colspan=11 class=footer>Währung: Euro - FiBu: LX Office ERP
-(Version <%version%>) - Formular: 11.01.2007</td>
-</tr>
-
-</table>
-</body>
diff --git a/templates/print/German/taxbird.txb b/templates/print/German/taxbird.txb
deleted file mode 100644
index c1a8a39cc..000000000
--- a/templates/print/German/taxbird.txb
+++ /dev/null
@@ -1,23 +0,0 @@
-;; This file was produced by lx-office
-;; for using in taxbird.
-;; You probably don't want to touch this
-;; file. In case you do want it anyway,
-;; be warned: BE CAREFUL!!
-;;
-'("Umsatzsteuervoranmeldung <%year%>" (
-("vend-id" . "74931")
-("land-lieferant" . "<%elsterland%>")
-("name-lieferant" . "<%company%>")
-("berufsbez" . "")
-("strasse-lieferant" . "<%co_street%>")
-("plz-lieferant" . "<%co_zip%> ")
-("ort-lieferant" . "<%co_city%>")
-("vorwahl" . "<%co_phone_prefix%>")
-("anschluss" . "<%co_phone%>")
-("land" . "<%taxbird_land_nr%>")
-("zeitraum" . "<%taxbird_period%>")
-("stnr" . "<%taxbird_steuernummer%>")
-
-<%foreach id%>
-("<%id%>" . "<%amount%>")<%end%>
-))
\ No newline at end of file
diff --git a/templates/print/German/ustva-2012.tex b/templates/print/German/ustva-2012.tex
deleted file mode 100644
index 3a35db9d6..000000000
--- a/templates/print/German/ustva-2012.tex
+++ /dev/null
@@ -1,153 +0,0 @@
-% German USTVA template for taxreports
-% Contributed by Marcus Habermehl
-% Based on template by Jacky und Stefan Tenne (German-ustva-2008.tex)
-%
-%
-\documentclass[twoside]{scrartcl}
-\usepackage{a4,german}
-\usepackage[frame]{xy}
-\usepackage[utf8]{inputenc}
-\usepackage[german]{babel}
-\usepackage{graphicx}
-\usepackage{tabularx}
-\usepackage{times, german}
-\usepackage{german}
-\setlength{\voffset}{-0.7cm} %hier wird die Höhenverschiebung
-\setlength{\hoffset}{-1cm} %und hier die Verschiebung seitwärts
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0cm}
-\setlength{\headsep}{0cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{0cm}
-\setlength{\evensidemargin}{0cm}
-\setlength{\textwidth}{20.9cm}
-\setlength{\textheight}{29.6cm}
-\setlength{\footskip}{-0cm}
-\setlength{\parindent}{1mm}
-
-\begin{document}
-
-\fontfamily{cmss}\fontshape{n}\large\selectfont
-\pagestyle{myheadings}
-\markboth{\protect\scalebox{1.045}[1.045]{\protect\includegraphics[viewport = 54 783 700 790,page=2]{ustva-2012.pdf}}}%Seite 2
-{\protect\scalebox{1.045}[1.045]{\protect\includegraphics[viewport = 70 700 700 790,page=1]{ustva-2012.pdf}}}%Seite 1
-\hspace{1mm}
-\begin{tabular}[b]{p{7mm}p{5cm}p{22.5mm}p{24mm}p{7mm}p{28mm}p{3mm}}
-\multicolumn{7}{c}{}\\[-2mm]
- & \multicolumn{6}{l}{<%steuernummer%>}\\
-\multicolumn{7}{c}{}\\[15mm]
-\multicolumn{2}{p{7.5cm}}{<%FA_Name%>} & & & & &\\[-4mm]
-\multicolumn{2}{p{7.5cm}}{} & & & & &\\[3mm]
-\multicolumn{2}{p{7.5cm}}{<%FA_Strasse%>} & &<%0401%>&<%0407%>&&<%0441%>\\[1.2mm]
-\multicolumn{2}{p{7.5cm}}{} & &<%0402%>&<%0408%>&&<%0442%>\\[1.25mm]
-\multicolumn{2}{p{7.5cm}}{<%FA_PLZ%> <%FA_Ort%>} & &<%0403%>&<%0409%>&&<%0443%>\\[3mm]
-\multicolumn{2}{p{7.5cm}}{} & &<%0404%>&<%0410%>&&<%0444%>\\[1.25mm]
-\multicolumn{2}{p{7.5cm}}{} & &<%0405%>&<%0411%>&&\\[1.25mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%company%>}} & &<%0406%>&<%0412%>&&\\[-1mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%co_street%>}}& & & & &\\[-1mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%co_city%>}}& & & &<%FA_10%> &\\[1mm]
-\multicolumn{2}{p{7.5cm}}{
-<%if tel%>
-\small{Tel: <%tel%>}~--~
-<%else%>
-\small{~}
-<%end tel%>
-<%if fax%>
-\small{Fax: <%fax%>}
-<%else%>
-\small{~}
-<%end fax%>
-}& & & & &\\[1.8mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%email%>}}&~& & & &\\[-1mm]
-\end{tabular}\\[2.5mm]
-\begin{tabular}[b]{p{99mm}p{26.5mm}p{4.55mm}p{4mm}p{35mm}}
-&&&&\\[9.5mm]
-\multicolumn{2}{r}{<%41%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%44%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%49%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%43%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%48%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%81%>} & & \multicolumn{2}{r}{<%811%>}\\[1.8mm]
-\multicolumn{2}{r}{<%86%>} & & \multicolumn{2}{r}{<%861%>}\\[1.8mm]
-\multicolumn{2}{r}{<%35%>} & & \multicolumn{2}{r}{<%36%>}\\[1.8mm]
-\multicolumn{2}{r}{<%77%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%76%>} & & \multicolumn{2}{r}{<%80%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%91%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%89%>} & & \multicolumn{2}{r}{<%891%>}\\[1.8mm]
-\multicolumn{2}{r}{<%93%>} & & \multicolumn{2}{r}{<%931%>}\\[1.8mm]
-\multicolumn{2}{r}{<%95%>} & & \multicolumn{2}{r}{<%98%>}\\[1.8mm]
-\multicolumn{2}{r}{<%94%>} & & \multicolumn{2}{r}{<%96%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%42%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%60%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%21%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{<%45%>} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z43%>}\\
-\end{tabular}
-\newpage
-
-\vspace*{-9.5mm}\hspace{27mm}<%steuernummer%>\\[-2.7mm]
-\begin{tabular}[b]{p{99mm}p{25.2mm}p{2.55mm}p{10mm}p{32mm}}
-&&&&\\
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z45%>}\\[13.5mm]
-\multicolumn{2}{r}{<%46%>} & & \multicolumn{2}{r}{<%47%>}\\[1.8mm]
-\multicolumn{2}{r}{<%52%>} & & \multicolumn{2}{r}{<%53%>}\\[1.8mm]
-\multicolumn{2}{r}{<%73%>} & & \multicolumn{2}{r}{<%74%>}\\[1.8mm]
-\multicolumn{2}{r}{<%84%>} & & \multicolumn{2}{r}{<%85%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%65%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z53%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%66%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%61%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%62%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%67%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%63%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%64%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%59%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z62%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%69%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%39%>}\\[1.8mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{\textbf{<%83%>}}\\[25.6mm]
-\end{tabular}\\[35mm]
-<%if FA_steuerberater%>
-\vspace{11mm}
-\begin{list}{}{
-\setlength{\leftmargin}{2mm}
-\setlength{\itemsep}{0mm}
-\setlength{\parsep}{0mm}
-%\setlength{\topsep}{0mm}
-%\setlength{\parskip}{0mm}
-%\setlength{\partopsep}{0mm}
-}
-\begin{small}
-\item <%FA_steuerberater_name%>
-\item <%FA_steuerberater_street%>
-\item <%FA_steuerberater_city%>
-\item Tel:~<%FA_steuerberater_tel%>
-\end{small}\\[15mm]
-\item <%Datum_heute%>,
-\end{list}
-<%end FA_steuerberater%>
-<%if not FA_steuerberater%>
-\begin{list}{}{
-\setlength{\leftmargin}{2mm}
-\setlength{\itemsep}{0mm}
-\setlength{\parsep}{0mm}
-%\setlength{\topsep}{0mm}
-%\setlength{\parskip}{0mm}
-%\setlength{\partopsep}{0mm}
-}
-\begin{small}
-\item ~
-\item ~
-\item ~
-\item ~
-\end{small}\\[26mm]
-\item <%Datum_heute%>,
-\end{list}
-<%end FA_steuerberater%>
-\end{document}
diff --git a/templates/print/German/ustva.html b/templates/print/German/ustva.html
deleted file mode 100644
index 1f5da1ae7..000000000
--- a/templates/print/German/ustva.html
+++ /dev/null
@@ -1,436 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
- <meta content="text/html; charset=utf-8" http-equiv="content-type">
- <title>Vorschau: UStVa</title>
-<!--
-Optik an Formulare angepasst: Hartmut Goebel <h.goebel@goebel-consult.de>
-Variablen hinzugefügt: Udo Spallek <udono@gmx.net>
-Text-Erklärung und unterschiedliche Zeilenfärbung ergänzt: Kai-Martin Knaak <kmk@familieknaak.de>
--->
- <style>
-table {
- text-align: right;
- border:0;
- border-collapse:collapse;
-}
-td {
- font-size:100%;
- vertical-align:top;
-}
-td.text {
- text-align: left;
- background-color:#BDBEBD;
-}
-td.text2 {
- text-align: left;
- background-color:#ADBEBD;
-}
-td.spalte,
-td.zeile,
-td.betrag {
- border:solid thin black;
-}
-td.spalte { font-weight:bold; font-size:120%; }
-td.zeile { font-weight:bold; }
-td.betrag { width:10em; }
-td.summe { border:solid medium black; }
-td.spacer { border:0 }
-
-tr.uebertrag td { border-top:solid medium black; }
-b.h3 { font-size:120%; }
-.ausfuellen { background-color:#FFFFC0; }
-.nodis { display:none; }
- </style>
-</head>
-<body>
-<h1>Vorschau Umsatzsteuer-Voranmeldung</h1>
-<h2>Zeitraum vom <%fromdate%> bis <%todate%> </h2>
-
-<!-- Diese HTML-Formular ist nicht selbstrechnend.
-<p><small>Wenn ein (selbstrechnendes) Formular verwendet wird, genügt es, die
-gelb hinterlegten Felder auszufüllen. Die anderen Felder werden dann
-automatisch berechnet.</small></p>
--->
-
-<table width="100%">
-<tr align="left">
- <td class="text">Steuernummer: <%steuernummer%></td>
- <td class="text" width="100px"> </td>
- <td class="text" align="right">Datum (<%Datum_heute%>)</td>
-</tr>
-<tr>
- <td class="text" colspan="3"><br /></td>
-</tr>
-<tr align="left">
- <td class="text">
- Finanzamt <%FA_Name%><br />
- <%FA_Strasse%><br />
- <%FA_PLZ%> <%FA_Ort%><br />
- Fax: <%FA_FAX%>
- </td>
- <td class="text"> </td>
- <td class="text">
- Firma <%company%><br />
- <%if company_street%>
- <%company_street%><br />
- <%company_city%><br />
- <%end company_street%>
- <%if not company_street%>
- <%address%><!--used Address-->
- <%end company_street%>
- </td>
-</tr>
-<tr>
- <td class="text" colspan="3"><br />
- </td>
-</tr>
-</table>
-<table border="0" cellspacing="2" cellpadding="2">
- <tbody>
- <tr>
- <td class="text"><b class="h3">I. Anmeldung der
-Umsatzsteuer-Vorauszahlung </b></td>
- <td colspan="4"></td>
- </tr>
- <tr>
- <td class="text"><b class="h4">Lieferungen und sonstige Leistungen</b></td>
- <td colspan="4"></td>
- </tr>
- <tr>
- <td class="text2">an innergemeinschaftliche Abnehmer <b>mit</b> USt-IdNr</td>
- <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>41<span class="nodis">)</span></td>
- <td class="betrag ausfuellen" width="70"><%41%><br></td>
- <td class="spalte"><span class="nodis"></span></td>
- <td class="betrag"></td>
- </tr>
- <tr>
- <td class="text">neuer Fahrzeuge an Abnehmer <b>ohne</b> USt-IdNr</td>
- <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>44<span class="nodis">)</span></td>
- <td class="betrag ausfuellen" width="70"><%44%><br></td>
- <td class="spalte"><span class="nodis"></span></td>
- <td class="betrag"></td>
- </tr>
- <tr>
- <td class="text2">neuer Fahrzeuge außerhalb eines Unternehmens</td>
- <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>49<span class="nodis">)</span></td>
- <td class="betrag ausfuellen" width="70"><%49%><br></td>
- <td class="spalte"><span class="nodis"></span></td>
- <td class="betrag"></td>
- </tr>
- <tr>
- <td class="text">Weitere steuerfreie Umsätze mit Vorsteuerabzug</td>
- <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>43<span class="nodis">)</span></td>
- <td class="betrag ausfuellen" width="70"><%43%><br></td>
- <td class="spalte"><span class="nodis"></span></td>
- <td class="betrag"></td>
- </tr>
- <tr>
- <td class="text2">Steuerfreie Umsätze ohne
-Vorsteuerabzug. </b><br />Umsätze nach § 4 Nr. 8 bis 20 UStG</td>
- <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>48<span class="nodis">)</span></td>
- <td class="betrag ausfuellen" width="70"><%48%><br></td>
- <td class="spalte"><span class="nodis"></span></td>
- <td class="betrag"></td>
- </tr>
-
- <tr>
- <td class="text"><b class="h4">Steuerpflichtige Umsätze</b></td>
- <td colspan="4"></td>
- </tr>
-<%if not year2007%>
- <tr>
- <td class="text2">zum Steuersatz von 16 v.H.</td>
- <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>51<span class="nodis">)</span></td>
- <td class="betrag ausfuellen" width="70"><%51%><br></td>
- <td class="spalte"><span class="nodis">(Spalte 51 rechts)</span></td>
- <td class="betrag"><%511%></td>
- </tr>
-<%end year2007%>
-<%if year2007%>
- <tr>
- <td class="text2">zum Steuersatz von 19 v.H.</td>
- <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>81<span class="nodis">)</span></td>
- <td class="betrag ausfuellen" width="70"><%81%><br></td>
- <td class="spalte"><span class="nodis">(Spalte 81 rechts)</span></td>
- <td class="betrag"><%811%></td>
- </tr>
-<%end year2007%>
-
- <tr>
- <td class="text">zum Steuersatz von 7 v.H.</td>
- <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>86<span class="nodis">)</span></td>
- <td class="betrag ausfuellen"><%86%></td>
- <td class="spalte"><span class="nodis">(Spalte 86 rechts)</span></td>
- <td class="betrag"><%861%></td>
- </tr>
- <tr>
- <td class="text2">andere Steuersätze</td>
- <td class="spalte ausfuellen"><span class="nodis"></span>35 <span class="nodis"></span></td>
- <td class="betrag ausfuellen"><%35%></td>
- <td class="spalte">36</td>
- <td class="betrag ausfuellen"><%36%></td>
- </tr>
- <tr><td class="text" colspan="3"> </td><td colspan="4"></td></tr>
- <tr>
- <td class="text">Lieferungen in das übrige Gemeinschaftsgebiet <b>mit</b> USt-IdNr</td>
- <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>77<span class="nodis">)</span></td>
- <td class="betrag ausfuellen" width="70"><%77%><br></td>
- <td class="spalte"><span class="nodis"></span></td>
- <td class="betrag"></td>
- </tr>
- <tr>
- <td class="text2">Umsätze, nach §24 UStG (Sägewerkserzeugnisse, alkoholische Getränke etc.)</td>
- <td class="spalte ausfuellen"><span class="nodis"></span>76 <span class="nodis"></span></td>
- <td class="betrag ausfuellen"><%76%></td>
- <td class="spalte">80</td>
- <td class="betrag ausfuellen"><%80%></td>
- </tr>
- <tr><td class="text"> </td><td class="spacer" colspan="4"></td></tr>
- <tr>
- <td class="text"><b class="h3">Innergemeinschaftliche Erwerbe</b></td>
- <td colspan="4"></td>
- </tr>
- <tr>
- <td class="text2">Steuerfrei nach §4b UStG</td>
- <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>91<span class="nodis">)</span></td>
- <td class="betrag ausfuellen" width="70"><%91%><br></td>
- <td class="spalte"><span class="nodis"></span></td>
- <td class="betrag"></td>
- </tr>
-<%if not year2007%>
- <tr>
- <td class="text">Steuerpflichtige zum Steuersatz von 16 v.H.</td>
- <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>97<span class="nodis">)</span></td>
- <td class="betrag ausfuellen"><%97%><br></td>
- <td class="spalte"><span class="nodis">(Spalte 97 rechts)</span></td>
- <td class="betrag"><%971%></td>
- </tr>
-<%end if year2007%>
-<%if year2007%>
- <tr>
- <td class="text">Steuerpflichtige zum Steuersatz von 19 v.H.</td>
- <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>89<span class="nodis">)</span></td>
- <td class="betrag ausfuellen"><%89%><br></td>
- <td class="spalte"><span class="nodis">(Spalte 89 rechts)</span></td>
- <td class="betrag"><%891%></td>
- </tr>
-<%end if year2007%>
- <tr>
- <td class="text2">zum Steuersatz von 7 v.H.</td>
- <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>93<span class="nodis">)</span></td>
- <td class="betrag ausfuellen"><%93%></td>
- <td class="spalte"><span class="nodis">(Spalte 93 rechts)</span></td>
- <td class="betrag"><%931%></td>
- </tr>
- <tr>
- <td class="text">zu anderen Steuersätzen</td>
- <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>95<span class="nodis">)</span></td>
- <td class="betrag ausfuellen"><%95%></td>
- <td class="spalte">98</td>
- <td class="betrag"><%98%></td>
- </tr>
- <tr>
- <td class="text2"><b class="h4">neuer Fahrzeuge von Lieferern</b>
- von Lieferanten <b>ohne</b> USt.IdNr. <br class="nodis" />
- zum allgemeinen Steuersatz</td>
- <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>94<span class="nodis">)</span></td>
- <td class="betrag ausfuellen"><%94%></td>
- <td class="spalte"><span class="nodis">(Spalte </span>96<span class="nodis">)</span></td>
- <td class="betrag"><%96%></td>
- </tr>
- <tr><td class="text"> </td><td colspan="4"></td></tr>
- <tr>
- <td class="text">Lieferungen des ersten Abnehmers bei
- innergemeinschaftlichen Dreiecksgeschften (§25b Abs. 2 UStG)</td>
- <td class="spalte ausfuellen">42</td>
- <td class="betrag ausfuellen" width="70"><%42%><br></td>
- <td class="spalte"><span class="nodis"></span></td>
- <td class="betrag"></td>
- </tr>
- <tr>
- <td class="text2">Steuerpflichtige Umstze im Sinne, für die der
- <b>Leistungsempfänger die Steuer schuldet</b></td>
- <td class="spalte ausfuellen">60</td>
- <td class="betrag ausfuellen" width="70"><%60%><br></td>
- <td class="spalte"><span class="nodis"></span></td>
- <td class="betrag"></td>
- </tr>
-<%if year2010%>
- <tr>
- <td class="text2"><b>Nicht steuerbare Leistungen</b> gem. § 18b Satz 1 Nr. 2 UStG</td>
- <td class="spalte ausfuellen">21</td>
- <td class="betrag ausfuellen" width="70"><%21%><br></td>
- <td class="spalte"><span class="nodis"></span></td>
- <td class="betrag"></td>
- </tr>
-<%end if year2010%>
- <tr>
- <td class="text">Im Inland nicht steuerbare Umsätze</td>
- <td class="spalte ausfuellen">45</td>
- <td class="betrag ausfuellen" width="70"><%45%><br></td>
- <td class="spalte"><span class="nodis"></span></td>
- <td class="betrag"></td>
- </tr>
-
- <tr><td class="text"> </td><td class="spacer" colspan="2"></td><td colspan="2"></td></tr>
-
- <tr>
- <td class="text" colspan="3"><b class="h3">Übertrag</td>
- <td class="zeile"><span class="nodis">(</span>Zeile 43<span class="nodis">)</span></td>
- <td class="betrag"><%Z43%></td>
- </tr>
-
- <tr class="uebertrag">
- <td class="text" colspan="3"><b class="h3">Übertrag</td>
- <td class="zeile"><span class="nodis">(</span>Zeile 45<span class="nodis">)</span></td>
- <td class="betrag"><%Z45%></td>
- </tr>
-
-<%if year2010%>
- <tr>
- <td class="text2">Im Inland steuerpflichtige sonstige Leistungen von im übrigen Gemeinschaftsgebiet ansässigen Unternehmen (§13b Abs. 1 UStG)</td>
- <td class="spalte ausfuellen">46</td>
- <td class="betrag ausfuellen"><%46%></td>
- <td class="spalte">47</td>
- <td class="betrag"><%47%></td>
- </tr>
-<%end if year2010%>
- <tr>
- <td class="text2">Leistungen eines im Ausland ansässigen Unternehmers</td>
- <td class="spalte ausfuellen">52</td>
- <td class="betrag ausfuellen"><%52%></td>
- <td class="spalte">53</td>
- <td class="betrag"><%53%></td>
- </tr>
- <tr>
- <td class="text">Lieferungen sicherungsbereigneter Gegenstände und
- Umsätze, die unter das GrEStG fallen.</td>
- <td class="spalte ausfuellen">73</td>
- <td class="betrag ausfuellen"><%73%></td>
- <td class="spalte">74</td>
- <td class="betrag"><%74%></td>
- </tr>
- <tr>
- <td class="text2">Bauleistungen eines im Inland ansässigen Unternehmers</td>
- <td class="spalte ausfuellen">84</td>
- <td class="betrag ausfuellen"><%84%></td>
- <td class="spalte">85</td>
- <td class="betrag"><%85%></td>
- </tr>
- <tr>
- <td class="text" colspan="3">Steuer wegen Wechsel der Besteuerungsform und
- Nachsteuer auf versteuerte Anzahlungen wegen Steuersatzerhöhung.</td>
- <td class="spalte ausfuellen">65</td>
- <td class="betrag ausfuellen"><%65%></td>
- </tr>
-
-
-
- <tr><td class="text" colspan="3"> </td><td class="spacer" colspan="4"></td></tr>
-
- <tr>
- <td class="text2" colspan="3"><b class="h3">Umsatzsteuer</td>
- <td class="zeile"><span class="nodis">(</span>Zeile 53<span class="nodis">)</span></td>
- <td class="betrag"><%Z53%></td>
- </tr>
-
- <tr><td class="text" colspan="3"> </td><td class="spacer" colspan="4"></td></tr>
-
- <tr>
- <td class="text" colspan="3"><b class="h3">Abziehbare Vorsteuerbeträge</b></td>
- <td colspan="2"></td></tr>
- </tr>
-
- <tr>
- <td class="text2" colspan="3">Vorsteuerbeträge von Rechnungen von anderen Unternehmern</td>
- <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>66<span class="nodis">)</span></td>
- <td class="betrag ausfuellen"><%66%></td>
- </tr>
- <tr>
- <td class="text" colspan="3">Vorsteuerbeträge aus dem innergemeinschaftlichen Erwerb</td>
- <td class="spalte ausfuellen">61</td>
- <td class="betrag ausfuellen"><%61%></td>
- </tr>
- <tr>
- <td class="text2" colspan="3">Entrichtete Einfuhrumsatzsteuer</td>
- <td class="spalte ausfuellen">62</td>
- <td class="betrag ausfuellen"><%62%></td>
- </tr>
- <tr>
- <td class="text" colspan="3">Vorsteuerbeträge aus Leistungen im Sinne
- des §13b Abs. 1 UStG</td>
- <td class="spalte ausfuellen">67</td>
- <td class="betrag ausfuellen"><%67%></td>
- </tr>
- <tr>
- <td class="text2" colspan="3">Vorsteuerbeträge, die nach allgemeinen
- Durchschnittsästzen berechnet sind </td>
- <td class="spalte ausfuellen">63</td>
- <td class="betrag ausfuellen"><%63%></td>
- </tr>
- <tr>
- <td class="text" colspan="3">Berichtigung des Vorsteuerabzugs</td>
- <td class="spalte ausfuellen">64</td>
- <td class="betrag ausfuellen"><%64%></td>
- </tr>
- <tr>
- <td class="text2" colspan="3">Vorsteuerabzug für innergemeinschaftliche Lieferungen
- neuer Fahrzeuge außerhalb eines Unternehmens sowie von Kleinunternehmern</td>
- <td class="spalte ausfuellen">59</td>
- <td class="betrag ausfuellen"><%59%></td>
- </tr>
- <tr>
- <td class="text" colspan="3">Verbleibender Betrag</td>
- <td class="zeile"><span class="nodis">(</span>Zeile 62<span class="nodis">)</span></td>
- <td class="betrag"><%Z62%></td>
- </tr>
-
- <tr>
- <td class="text2" colspan="3"><b class="h3">Andere Steuerbeträge</b></td>
- <td colspan="2"></td></tr>
- </tr>
- <tr>
- <td class="text" colspan="3">in Rechnungen unrichtig oder unberechtigt ausgewiesene
- Steuerbeträge sowie Steuerbeträge, die nach
- §4 Nr. 4a, § 6a Abs. 4, §7 oder §25b UStG geschuldet werden</td>
- <td class="spalte ausfuellen">69</td>
- <td class="betrag ausfuellen"><%69%></td>
- </tr>
-
- <tr><td class="text" colspan="3"> </td><td colspan="4"></td></tr>
-
- <tr>
- <td class="text2" colspan="3"><b class="h3">Umsatzsteuer-Vorauszahlung/Überschuss</b></td>
- <td class="zeile"><span class="nodis">(</span>Zeile 65<span class="nodis">)</span></td>
- <td class="betrag"><%Z65%></td>
- </tr>
- <tr>
- <td class="text" colspan="3">Anrechnung (Abzug) der festgesetzten Sondervorauszahlung
- für Dauerfristverlängerung (nur in der letzten Voranmeldung des
- Besteuerungszeitraums, ausfüllen)</td>
- <td class="spalte ausfuellen">39</td>
- <td class="betrag ausfuellen"><%39%></td>
- </tr>
-
- <tr><td class="text" colspan="3"> </td><td colspan="4"></td></tr>
-
- <tr class="noborder">
- <td class="text2" colspan="3"><b class="h3">Verbleibende Umsatzsteuer-Vorauszahlung bzw.
- Verbleibender Überschuss</b></td>
- <td class="spalte ausfuellen">83</td>
- <td class="summe"><%83%></td>
- </tr>
-
- </tbody>
-</table>
-<%if FA_steuerberater%>
-<p>
-Steuerberater:<br />
-<%FA_steuerberater_name%><br />
-<%FA_steuerberater_street%><br />
-<%FA_steuerberater_city%><br />
-Tel: <%FA_steuerberater_tel%></p>
-<%end FA_steuerberater%>
-</body>
-</html>
diff --git a/templates/print/German/ustva.tex b/templates/print/German/ustva.tex
deleted file mode 100644
index da26f47a8..000000000
--- a/templates/print/German/ustva.tex
+++ /dev/null
@@ -1,120 +0,0 @@
-% German USTVA template for taxreports
-%
-% Contributed by Jens Koerner, Peter Schorer, Udo Spallek
-%
-%
-\documentclass[twoside]{scrartcl}
-\usepackage{a4,german}
-\usepackage[frame]{xy}
-\usepackage[utf8]{inputenc}
-\usepackage[german]{babel}
-\usepackage{graphicx}
-\usepackage{tabularx}
-\usepackage{times, german}
-\usepackage{german}
-\setlength{\voffset}{-0.8cm} %hier wird die Höhenverschiebung getÃâ¬tigt
-\setlength{\hoffset}{-1cm} %und hier die Verschiebung seitwÃâ¬rts
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0cm}
-\setlength{\headsep}{0cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{0cm}
-\setlength{\evensidemargin}{0cm}
-\setlength{\textwidth}{20.9cm}
-\setlength{\textheight}{29.6cm}
-\setlength{\footskip}{-0cm}
-\setlength{\parindent}{0pt}
-
-\begin{document}
-
-\fontfamily{cmss}\fontshape{n}\large\selectfont
-\pagestyle{myheadings}
-\markboth{\hspace{7mm}\protect\includegraphics[viewport = 60 700 700 790]{ustva2.pdf}}
-{\protect\includegraphics[viewport = 60 700 700 790]{ustva1.pdf}}
-\hspace{1mm}
-\begin{tabular}[b]{p{7mm}p{5cm}p{22.5mm}p{24mm}p{5mm}p{27mm}p{3mm}}
-\multicolumn{7}{c}{}\\[-2mm]
- & \multicolumn{6}{l}{<%steuernummer%>}\\
-\multicolumn{7}{c}{}\\[15mm]
-\multicolumn{2}{p{7.5cm}}{<%FA_Name%>} & & & & &\\[-4mm]
-\multicolumn{2}{p{7.5cm}}{} & & & & &\\[1mm]
-\multicolumn{2}{p{7.5cm}}{<%FA_Strasse%>} & &<%0401%>&<%0407%>&&<%0441%>\\[1.2mm]
-\multicolumn{2}{p{7.5cm}}{} & &<%0402%>&<%0408%>&&<%0442%>\\[1.25mm]
-\multicolumn{2}{p{7.5cm}}{<%FA_PLZ%> <%FA_Ort%>} & &<%0403%>&<%0409%>&&<%0443%>\\[1.25mm]
-\multicolumn{2}{p{7.5cm}}{} & &<%0404%>&<%0410%>&&<%0444%>\\[1.25mm]
-\multicolumn{2}{p{7.5cm}}{} & &<%0405%>&<%0411%>&&\\[1.25mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%company%>}} & &<%0406%>&<%0412%>&&\\[-1mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%company_street%>}}& & & & &\\[-1mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%company_city%>}}& & & & &\\[1mm]
-\multicolumn{2}{p{7.5cm}}{
-<%if tel%>
-\small{Tel: <%tel%>}~--~
-<%end tel%>
-<%if fax%>
-\small{Fax: <%fax%>}
-<%end fax%>
-}& & & &<%FA_10%> &\\[-1mm]
-\multicolumn{2}{p{7.5cm}}{\small{<%email%>}}& & & & &\\[-1mm]
-\end{tabular}\\[28.5mm]
-\begin{tabular}[b]{p{95mm}p{28mm}p{2.55mm}p{4mm}p{35mm}}
-&&&&\\[42mm]
-\multicolumn{2}{r}{<%51%>} & & \multicolumn{2}{r}{<%51r%>}\\[1.5mm]
-\multicolumn{2}{r}{<%86%>} & & \multicolumn{2}{r}{<%86r%>}\\[46mm]
-\multicolumn{2}{r}{<%97%>} & & \multicolumn{2}{r}{<%97r%>}\\[1.5mm]
-\multicolumn{2}{r}{<%93%>} & & \multicolumn{2}{r}{<%93r%>}\\[7.9mm]
-\multicolumn{2}{r}{<%94%>} & & \multicolumn{2}{r}{<%96%>}\\[14mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%43%>}\\
-%\multicolumn{2}{||r|}{1000} & & & \\
-%\multicolumn{2}{||r|}{1000} & & \multicolumn{2}{r}{100.000.000~~00}\\
-%\multicolumn{3}{||r|}{1.000.000.000~~00} & \multicolumn{2}{r}{100.000.000~~00}\\
-\end{tabular}
-
-\newpage
-
-\vspace*{-10mm}\hspace{27mm}<%steuernummer%>\\[-2.5mm]
-\begin{tabular}[b]{p{95mm}p{28mm}p{2.55mm}p{4mm}p{35mm}}
-&&&&\\
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%45%>}\\[46mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%43%>}\\[7.9mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%66%>}\\[7.9mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%62%>}\\[58.5mm]
-\multicolumn{2}{r}{} & & \multicolumn{2}{r}{\textbf{<%67%>}}\\[26mm]
-\end{tabular}\\[35mm]
-<%if FA_steuerberater%>
-\vspace{11mm}
-\begin{list}{}{
-\setlength{\leftmargin}{2mm}
-\setlength{\itemsep}{0mm}
-\setlength{\parsep}{0mm}
-%\setlength{\topsep}{0mm}
-%\setlength{\parskip}{0mm}
-%\setlength{\partopsep}{0mm}
-}
-\begin{small}
-\item <%FA_steuerberater_name%>
-\item <%FA_steuerberater_street%>
-\item <%FA_steuerberater_city%>
-\item Tel:~<%FA_steuerberater_tel%>
-\end{small}\\[15mm]
-\item <%Datum_heute%>,
-\end{list}
-<%end FA_steuerberater%>
-<%if not FA_steuerberater%>
-\begin{list}{}{
-\setlength{\leftmargin}{2mm}
-\setlength{\itemsep}{0mm}
-\setlength{\parsep}{0mm}
-%\setlength{\topsep}{0mm}
-%\setlength{\parskip}{0mm}
-%\setlength{\partopsep}{0mm}
-}
-\begin{small}
-\item ~
-\item ~
-\item ~
-\item ~
-\end{small}\\[26mm]
-\item <%Datum_heute%>,
-\end{list}
-<%end FA_steuerberater%>
-\end{document}
diff --git a/templates/print/German/winston.xml b/templates/print/German/winston.xml
deleted file mode 100644
index 2bb63da22..000000000
--- a/templates/print/German/winston.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- Diese Datei ist mit Lx-Office <%version%> generiert -->
-<WinstonAusgang>
- <Formular Typ="UST"></Formular>
- <Ordnungsnummer><%elsterFFFF%><%elstersteuernummer%></Ordnungsnummer>
- <AnmeldeJahr><%year%></AnmeldeJahr>
- <AnmeldeZeitraum><%period%></AnmeldeZeitraum>
-
-<%foreach id%>
- <Kennzahl nr="<%id%>"><%amount%></Kennzahl>
-<%end%>
-
-</WinstonAusgang>
-
diff --git a/templates/print/German/balance_sheet.html b/templates/print/Standard/balance_sheet.html
similarity index 100%
rename from templates/print/German/balance_sheet.html
rename to templates/print/Standard/balance_sheet.html
diff --git a/templates/print/German/bin_list.html b/templates/print/Standard/bin_list.html
similarity index 100%
rename from templates/print/German/bin_list.html
rename to templates/print/Standard/bin_list.html
diff --git a/templates/print/German/bin_list.tex b/templates/print/Standard/bin_list.tex
similarity index 100%
rename from templates/print/German/bin_list.tex
rename to templates/print/Standard/bin_list.tex
diff --git a/templates/print/Default/bwa.html b/templates/print/Standard/bwa.html
similarity index 100%
rename from templates/print/Default/bwa.html
rename to templates/print/Standard/bwa.html
diff --git a/templates/print/German/check.tex b/templates/print/Standard/check.tex
similarity index 100%
rename from templates/print/German/check.tex
rename to templates/print/Standard/check.tex
diff --git a/templates/print/German/credit_note.tex b/templates/print/Standard/credit_note.tex
similarity index 100%
rename from templates/print/German/credit_note.tex
rename to templates/print/Standard/credit_note.tex
diff --git a/templates/print/German/income_statement.html b/templates/print/Standard/income_statement.html
similarity index 100%
rename from templates/print/German/income_statement.html
rename to templates/print/Standard/income_statement.html
diff --git a/templates/print/German/invoice.html b/templates/print/Standard/invoice.html
similarity index 100%
rename from templates/print/German/invoice.html
rename to templates/print/Standard/invoice.html
diff --git a/templates/print/German/invoice.odt b/templates/print/Standard/invoice.odt
similarity index 100%
rename from templates/print/German/invoice.odt
rename to templates/print/Standard/invoice.odt
diff --git a/templates/print/German/invoice.tex b/templates/print/Standard/invoice.tex
similarity index 100%
rename from templates/print/German/invoice.tex
rename to templates/print/Standard/invoice.tex
diff --git a/templates/print/German/pick_list.html b/templates/print/Standard/pick_list.html
similarity index 100%
rename from templates/print/German/pick_list.html
rename to templates/print/Standard/pick_list.html
diff --git a/templates/print/German/pick_list.tex b/templates/print/Standard/pick_list.tex
similarity index 100%
rename from templates/print/German/pick_list.tex
rename to templates/print/Standard/pick_list.tex
diff --git a/templates/print/German/purchase_order.html b/templates/print/Standard/purchase_order.html
similarity index 100%
rename from templates/print/German/purchase_order.html
rename to templates/print/Standard/purchase_order.html
diff --git a/templates/print/German/purchase_order.tex b/templates/print/Standard/purchase_order.tex
similarity index 100%
rename from templates/print/German/purchase_order.tex
rename to templates/print/Standard/purchase_order.tex
diff --git a/templates/print/German/receipt.tex b/templates/print/Standard/receipt.tex
similarity index 100%
rename from templates/print/German/receipt.tex
rename to templates/print/Standard/receipt.tex
diff --git a/templates/print/German/request_quotation.html b/templates/print/Standard/request_quotation.html
similarity index 100%
rename from templates/print/German/request_quotation.html
rename to templates/print/Standard/request_quotation.html
diff --git a/templates/print/German/request_quotation.tex b/templates/print/Standard/request_quotation.tex
similarity index 100%
rename from templates/print/German/request_quotation.tex
rename to templates/print/Standard/request_quotation.tex
diff --git a/templates/print/German/sales_delivery_order.tex b/templates/print/Standard/sales_delivery_order.tex
similarity index 100%
rename from templates/print/German/sales_delivery_order.tex
rename to templates/print/Standard/sales_delivery_order.tex
diff --git a/templates/print/German/sales_order.html b/templates/print/Standard/sales_order.html
similarity index 100%
rename from templates/print/German/sales_order.html
rename to templates/print/Standard/sales_order.html
diff --git a/templates/print/German/sales_order.tex b/templates/print/Standard/sales_order.tex
similarity index 100%
rename from templates/print/German/sales_order.tex
rename to templates/print/Standard/sales_order.tex
diff --git a/templates/print/German/sales_quotation.html b/templates/print/Standard/sales_quotation.html
similarity index 100%
rename from templates/print/German/sales_quotation.html
rename to templates/print/Standard/sales_quotation.html
diff --git a/templates/print/German/sales_quotation.odt b/templates/print/Standard/sales_quotation.odt
similarity index 100%
rename from templates/print/German/sales_quotation.odt
rename to templates/print/Standard/sales_quotation.odt
diff --git a/templates/print/German/sales_quotation.tex b/templates/print/Standard/sales_quotation.tex
similarity index 100%
rename from templates/print/German/sales_quotation.tex
rename to templates/print/Standard/sales_quotation.tex
diff --git a/templates/print/German/statement.html b/templates/print/Standard/statement.html
similarity index 100%
rename from templates/print/German/statement.html
rename to templates/print/Standard/statement.html
diff --git a/templates/print/German/statement.tex b/templates/print/Standard/statement.tex
similarity index 100%
rename from templates/print/German/statement.tex
rename to templates/print/Standard/statement.tex
diff --git a/templates/print/Default/taxbird.txb b/templates/print/Standard/taxbird.txb
similarity index 100%
rename from templates/print/Default/taxbird.txb
rename to templates/print/Standard/taxbird.txb
diff --git a/templates/print/Default/ustva-2012.tex b/templates/print/Standard/ustva-2012.tex
similarity index 100%
rename from templates/print/Default/ustva-2012.tex
rename to templates/print/Standard/ustva-2012.tex
diff --git a/templates/print/Default/ustva.html b/templates/print/Standard/ustva.html
similarity index 100%
rename from templates/print/Default/ustva.html
rename to templates/print/Standard/ustva.html
diff --git a/templates/print/Default/ustva.tex b/templates/print/Standard/ustva.tex
similarity index 100%
rename from templates/print/Default/ustva.tex
rename to templates/print/Standard/ustva.tex
diff --git a/templates/print/Default/winston.xml b/templates/print/Standard/winston.xml
similarity index 100%
rename from templates/print/Default/winston.xml
rename to templates/print/Standard/winston.xml
diff --git a/templates/print/German/zahlungserinnerung.tex b/templates/print/Standard/zahlungserinnerung.tex
similarity index 100%
rename from templates/print/German/zahlungserinnerung.tex
rename to templates/print/Standard/zahlungserinnerung.tex
diff --git a/templates/print/German/zahlungserinnerung_invoice.tex b/templates/print/Standard/zahlungserinnerung_invoice.tex
similarity index 100%
rename from templates/print/German/zahlungserinnerung_invoice.tex
rename to templates/print/Standard/zahlungserinnerung_invoice.tex
diff --git a/templates/webpages/admin/edit_user.html b/templates/webpages/admin/edit_user.html
index 8db61d90d..6e8fe2f3c 100644
--- a/templates/webpages/admin/edit_user.html
+++ b/templates/webpages/admin/edit_user.html
@@ -144,7 +144,7 @@
</tr>
<tr>
<th align="right">[% 'Setup Templates' | $T8 %]</th>
- <td>[% L.select_tag('mastertemplates', all_master_templates, default = 'German') %]</td>
+ <td>[% L.select_tag('mastertemplates', all_master_templates, default = 'Standard') %]</td>
</tr>
<tr>
<th align="right">[% 'Setup Menu' | $T8 %]</th>
@@ -254,4 +254,3 @@
});
-->
</script>
-
--
2.20.1