From 8efbc44487e0f99236ec55539a61f1d0d04635a9 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus 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 @@ - - - -

-<%company%> -
<%address%> - -

BALANCE SHEET -
<%period%> -

- - - - - - - - -<%foreach asset_account%> - - - - - - -<%end asset_account%> - - - - - - - - - - - - - - - - - -<%foreach liability_account%> - - - - - - -<%end liability_account%> - - - - - - - - - - - - - - - - -<%foreach equity_account%> - - - - - - -<%end equity_account%> - - - - - - - - - - - - - - - - - -
ASSETS
<%this_period%><%last_period%>
<%asset_account%><%asset_this_period%><%asset_last_period%>
TOTAL ASSETS<%total_assets_this_period%>
<%total_assets_last_period%>
LIABILITIES
<%liability_account%><%liability_this_period%><%liability_last_period%>
Total Liabilities<%total_liabilities_this_period%>
- 		<%total_liabilities_last_period%>
-
SHAREHOLDER'S EQUITY
<%equity_account%><%equity_this_period%><%equity_last_period%>
Total Equity<%total_equity_this_period%>
- 		<%total_equity_last_period%>
-
TOTAL LIABILITIES & EQUITY<%total_this_period%>
<%total_last_period%>
- - - 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  - - - - - - - - - - - -
-

- <%company%> -
<%address%> -

- 		-

- Tel: <%tel%> -
Fax: <%fax%> -

- -
-

B I N    L I S T

-
-
  - - - - - - - - - - - -
FromShip To
<%name%> -
<%street%> -
<%zipcode%> -
<%city%> -
<%country%> -
- - <%if contact%> -
Attn: <%contact%> - <%end contact%> - - <%if vendorphone%> -
Tel: <%vendorphone%> - <%end vendorphone%> - - <%if vendorfax%> -
Fax: <%vendorfax%> - <%end vendorfax%> - - <%if email%> -
<%email%> - <%end email%> - - 		<%shiptoname%> -
<%shiptostreet%> -
<%shiptozipcode%> -
<%shiptocity%> -
<%shiptocountry%> - -
- <%if shiptocontact%> -
Attn: <%shiptocontact%> - <%end shiptocontact%> - - <%if shiptophone%> -
Tel: <%shiptophone%> - <%end shiptophone%> - - <%if shiptofax%> -
Fax: <%shiptofax%> - <%end shiptofax%> -
-
  - - - - - - <%if warehouse%> - - <%end warehouse%> - - - - - - - - <%if shippingdate%> - - <%end shippingdate%> - - <%if not shippingdate%> - - <%end shippingdate%> - - - - <%if warehouse%> - - <%end warehouse%> - - - - -
Order #DateContactWarehouseShipping PointShip via
<%ordnumber%> <%shippingdate%><%orddate%><%employee%> <%warehouse%><%shippingpoint%> <%shipvia%> 
-
  - - - - - - - - - - - - - - <%foreach number%> - - - - - - - - - - - - <%end number%> - -
PosNumberDescriptionSerialnumber QtyRecd Bin
<%runningnumber%><%number%><%description%><%serialnumber%><%deliverydate%><%qty%><%ship%><%unit%><%bin%>
-
 
- 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 @@ - - - -

-<%company%> -
<%address%> - -

INCOME STATEMENT -
<%period%> -

- - - - - - - - - -<%foreach income_account%> - - - - - - -<%end income_account%> - - - - - - - - - - - - - - - - - - -<%foreach expense_account%> - - - - - - -<%end expense_account%> - - - - - - - - - - - - - - - - - - -
INCOME
<%this_period%><%last_period%>
<%income_account%><%income_this_period%><%income_last_period%>
Total Income<%total_income_this_period%>
<%total_income_last_period%>
EXPENSES
<%expense_account%><%expenses_this_period%><%expenses_last_period%>
Total Expenses<%total_expenses_this_period%>
- 		<%total_expenses_last_period%>
-
INCOME / (LOSS)<%total_this_period%>
<%total_last_period%>
- - - - - - - - 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 @@ - - - - - - - - -
  - - - - - - - - - - - - -
-

- <%company%> -
<%address%> -

- 		-

- Telephone: <%tel%> -
Facsimile: <%fax%> -

-
-

I N V O I C E

-
- - - - - - - - - - - - - - - - - - - - - - - - - -<%if paid%> - - - - - - - -<%end paid%> - - - - - - - - - - - -<%foreach tax%> - - - -<%end tax%> - -<%if taxincluded%> - - - -<%end taxincluded%> - - - - - -
- - - - - - - - - - - - - - - - - - - -
Invoice Date <%invdate%>
Due Date <%duedate%>
Number <%invnumber%>
 
-
- - - - - - - - - - - - - -
To:Ship To:
<%name%> -
<%street%> -
<%zipcode%> -
<%city%> -
<%country%> - 		<%shiptoname%> -
<%shiptostreet%> -
<%shiptozipcode%> -
<%shiptocity%> -
<%shiptocountry%> -
-
 
- - - - - - - - - - - - -<%foreach number%> - - - - - - - - - - -<%end number%> - - - - - - - - -<%if taxincluded%> - - -<%end taxincluded%> -<%if not taxincluded%> - - -<%end taxincluded%> - - -<%foreach tax%> - - - - -<%end tax%> - -<%if paid%> - - - - -<%end paid%> - - - - - - - - - - - - - - - - -
NumberDescriptionQt'y PriceDiscAmount
<%number%><%description%><%qty%><%unit%><%sellprice%><%discount%><%linetotal%>
Total<%invtotal%>Subtotal<%subtotal%>
<%taxdescription%> on <%taxbase%> @ <%taxrate%> %<%tax%>
Paid- <%paid%>
 
Terms Net <%terms%> daysOutstanding<%total%>
 
-
- - -<%if notes%> - - -<%end notes%> - - - -
Notes<%notes%> - All prices in <%currency%> Funds -
<%shippingpoint%> -
-
 
- - - - - - - - - - - - - -<%end paid%> - -<%foreach payment%> - - - - - - -<%end payment%> - -<%if paid%> -
Payments
-
-
DateAccountSourceAmount
<%paymentdate%><%paymentaccount%><%paymentsource%><%payment%>
-
 
-
Thank you for your valued business! -
 
- - - - - -
- 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. - - - X
-
-
<%taxdescription%> Registration <%taxnumber%>
Taxes shown are included in price.
- -
- - - - 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  - - - - - - - - - - - - -
-

- <%company%> -
<%address%> -

- 		-

- Tel: <%tel%> -
Fax: <%fax%> -

-
-

P I C K    L I S T

-
-
  - - - - - - - - - - - -
Ship To: 
<%shiptoname%> -
<%shiptostreet%> -
<%shiptozipcode%> -
<%shiptocity%> -
<%shiptocountry%> - 		- <%if shiptocontact%> -
Attn: <%shiptocontact%> - <%end shiptocontact%> - - <%if shiptophone%> -
Tel: <%shiptophone%> - <%end shiptophone%> - - <%if shiptofax%> -
Fax: <%shiptofax%> - <%end shiptofax%> - - <%shiptoemail%> -
-
  - - - - - - <%if warehouse%> - - <%end warehouse%> - - - - - - - - <%if shippingdate%> - - <%end shippingdate%> - - <%if not shippingdate%> - - <%end shippingdate%> - - - - <%if warehouse%> - - <%end warehouse%> - - - - -
Order #DateContactWarehouseShipping PointShip via
<%ordnumber%> <%shippingdate%><%orddate%><%employee%> <%warehouse%> <%shippingpoint%> <%shipvia%> 
-
  - - - - - - - - - - - - <%foreach number%> - - - - - - - - - <%end number%> -
PosNumberDescriptionQtyShip Bin
<%runningnumber%> - <%number%><%description%><%qty%>[      ]<%unit%><%bin%>
-
 
- 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 @@ - - - - - - - - -
  - - - - - - - - - - - - -
-

- <%company%> -
<%address%> -

- 		-

- Telephone: <%tel%> -
Facsimile: <%fax%> -

-
-

P U R C H A S E    O R D E R

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - -
Order Date <%orddate%>
Required by <%reqdate%>
Number <%ordnumber%>
 
-
- - - - - - - - - - -
To:Ship To:
<%name%> -
<%street%> -
<%zipcode%> -
<%city%> -
<%country%> - -
-<%if contact%> -
Attn: <%contact%> -<%end contact%> -<%if vendorphone%> -
Tel: <%vendorphone%> -<%end vendorphone%> -<%if vendorfax%> -
Fax: <%vendorfax%> -<%end vendorfax%> - 		<%shiptoname%> -
<%shiptostreet%> -
<%shiptozipcode%> -
<%shiptocity%> -
<%shiptocountry%> - -
-<%if shiptocontact%> -
Attn: <%shiptocontact%> -<%end shiptocontact%> -<%if shiptophone%> -
Tel: <%shiptophone%> -<%end shiptophone%> -<%if shiptofax%> -
Fax: <%shiptofax%> -<%end shiptofax%> - -
-
 
- - - - - - - - - - - -<%foreach number%> - - - - - - - - - -<%end number%> - - - - - - - - - - -<%foreach tax%> - - - - -<%end tax%> - - - - - - - - - - - - - - - - -
NumberDescriptionQt'y PriceAmount
<%number%><%description%><%qty%><%unit%><%sellprice%><%linetotal%>
Subtotal<%subtotal%>
<%taxdescription%> @ <%taxrate%> %<%tax%>
 
Terms Net <%terms%> daysTotal<%ordtotal%>
 
-
- - -<%if notes%> - - -<%end notes%> - - - -
Notes
<%notes%>
 - All prices in <%currency%> Funds -
<%shippingpoint%> -
-
 
- - - - - -
- 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. - - - X
-
-
- -
- - - - 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 @@ - - - - - - - - -
  - - - - - - - - - - - - - - -
-

- <%company%> -
<%address%> -

- 		- -

- Tel: <%tel%> -
Fax: <%fax%> -

-
-

R E Q U E S T    F O R    Q U O T A T I O N

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - -
To:Ship To:
<%name%> -
<%street%> -
<%zipcode%> -
<%city%> -
<%country%> -
-<%if contact%> -
Attn: <%contact%> -<%end contact%> -<%if vendorphone%> -
Tel: <%vendorphone%> -<%end vendorphone%> -<%if vendorfax%> -
Fax: <%vendorfax%> -<%end vendorfax%> - 		<%shiptoname%> -
<%shiptostreet%> -
<%shiptozipcode%> -
<%shiptocity%> -
<%shiptocountry%> -
-<%if shiptocontact%> -
Attn: <%shiptocontact%> -<%end shiptocontact%> -<%if shiptophone%> -
Tel: <%shiptophone%> -<%end shiptophone%> -<%if shiptofax%> -
Fax: <%shiptofax%> -<%end shiptofax%> -
-
 
- - - - - - - - - - - - - - - - - - -
RFQ #DateRequired byContactShipping PointShip via
<%quonumber%><%quodate%><%reqdate%><%employee%><%shippingpoint%><%shipvia%>
-
Please provide price and delivery time for the following items:
- - - - - - - - - - - - -<%foreach number%> - - - - - - - - -<%end number%> - - - - - -
NumberDescriptionQt'y DeliveryUnit PriceExtended
<%number%><%description%><%qty%><%unit%>
-
- -<%if notes%> - - - - -<%end notes%> - -
Notes<%notes%>
-
 
- - - - - - -
  - X
-
-
- -
- - - - 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 @@ - - - - - - - - -
  - - - - - - - - - - - - -
-

- <%company%> -
<%address%> -

- 		-

- Telephone: <%tel%> -
Facsimile: <%fax%> -

-
-

S A L E S    O R D E R

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - -
Order Date <%orddate%>
Required by <%reqdate%>
Number <%ordnumber%>
 
-
- - - - - - - - - - - -
To:Ship To:
<%name%> -
<%street%> -
<%zipcode%> -
<%city%> -
<%country%> - 		<%shiptoname%> -
<%shiptostreet%> -
<%shiptozipcode%> -
<%shiptocity%> -
<%shiptocountry%> -
-
 
- - - - - - - - - - - - -<%foreach number%> - - - - - - - - - - -<%end number%> - - - - - - -<%if taxincluded%> - - -<%end taxincluded%> - -<%if not taxincluded%> - - -<%end taxincluded%> - - -<%foreach tax%> - - - - -<%end tax%> - - - - - - - - - - - -<%if taxincluded%> - - - -<%end taxincluded%> - - - - - -
NumberDescriptionQt'y PriceDiscAmount
<%number%><%description%><%qty%><%unit%><%sellprice%><%discount%><%linetotal%>
Total<%ordtotal%>Subtotal<%subtotal%>
<%taxdescription%> on <%taxbase%> @ <%taxrate%> %<%tax%>
 
Terms Net <%terms%> daysTotal<%ordtotal%>
Tax is included in Total
 
-
- - -<%if notes%> - - -<%end notes%> - - - -
Notes
<%notes%>
 - All prices in <%currency%> Funds -
<%shippingpoint%> -
-
 
- - - - - -
- 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. - - - X
-
-
- -
- - - - 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 @@ - - - - - - - - -
  - - - - - - - - - - - - - - - - -
-

- <%company%> -
<%address%> -

- 		-

- Tel: <%tel%> -
Fax: <%fax%> -

-
 
-

Q U O T A T I O N

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - -
<%name%> -
<%street%> -
<%zipcode%> -
<%city%> -
<%country%> -
-<%if contact%> -
Attn: <%contact%> -<%end contact%> - -<%if customerphone%> -
Tel: <%customerphone%> -<%end customerphone%> - -<%if customerfax%> -
Fax: <%customerfax%> -<%end customerfax%> - -<%if email%> -
<%email%> -<%end email%> -
-
 
- - - - - - - - - - - - - - - - - - -
NumberDateValid untilContactShipping PointShip via
<%quonumber%><%quodate%><%reqdate%><%employee%><%shippingpoint%><%shipvia%>
-
 
- - - - - - - - - - - - -<%foreach number%> - - - - - - - - - - - -<%end number%> - - - - - - -<%if taxincluded%> - - -<%end taxincluded%> - -<%if not taxincluded%> - - -<%end taxincluded%> - - -<%foreach tax%> - - - - -<%end tax%> - - - - - - - - - - - - - - - - -
No.NumberDescriptionQt'y PriceDiscAmount
<%runningnumber%><%number%><%description%><%qty%><%unit%><%sellprice%><%discount%><%linetotal%>
Total<%invtotal%>Subtotal<%subtotal%>
<%taxdescription%> on <%taxbase%> @ <%taxrate%> %<%tax%>
 
  -<%if terms%> - Terms Net <%terms%> days -<%end terms%> - Total<%quototal%>
 
-
- - -<%if notes%> - - -<%end notes%> - - - -
Notes<%notes%> - All prices in <%currency%> Funds -
-
 
- - - - - -
- Special order items are subject to a 10% cancellation fee. - - - X
-
-
- -
- - - - - 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  - - - - - - - - - - - - -
-

- <%company%> -
<%address%> -

- 		-

- Tel: <%tel%> -
Fax: <%fax%> -

-

S T A T E M E N T

<%statementdate%>
-
  - - - - -
<%name%> -
<%street%> -
<%zipcode%> -
<%city%> -
<%country%> -
-<%if customerphone%> -
Tel: <%customerphone%> -<%end customerphone%> -<%if customerfax%> -
Fax: <%customerfax%> -<%end customerfax%> -<%if email%> -
<%email%> -<%end email%> -
-
  - - - - - - - - - - -<%foreach invnumber%> - - - - - - - - - -<%end invnumber%> - - - - - - - - -
Invoice #DateDueCurrent306090+
<%invnumber%><%invdate%><%duedate%><%c0%><%c30%><%c60%><%c90%>
   <%c0total%> - <%c30total%> - <%c60total%> - <%c90total%> -
-
  - - - - - -
Total Outstanding<%total%>
-
 
 Please make check payable to <%company%>. -
- 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
<%company%> -

Kurzfristige Erfolgsrechnung <%period%>

-

SKR3   BWA

- 		Blatt 1
 Im BetrachtungszeitraumKumuliert seit Jahresanfang
BezeichnungWert% Ges.- Leistg.% Ges.- Kosten% Pers.- KostenAufschlagWert% Ges.- Leistg.% Ges.- Kosten% Pers.- KostenAufschlag
 
Umsatzerlöse<%jetzt1%><%jetztgl1%><%kumm1%><%kummgl1%> 
Best.Verdg. FE/UE<%jetzt2%><%jetztgl2%><%kumm2%><%kummgl2%> 
Akt.Eigenleistungen<%jetzt3%><%jetztgl3%><%kumm3%><%kummgl3%> 
 
Gesamtleistung<%jetztgesamtleistung%><%jetztglgesamtleistung%><%jetztgkgesamtleistung%><%jetztpkgesamtleistung%><%kummgesamtleistung%><%kummglgesamtleistung%><%kummgkgesamtleistung%><%kummpkgesamtleistung%> 
 
Mat./Wareneinkauf<%jetzt4%><%jetztgl4%><%jetztgk4%><%jetztpk4%><%jetztauf4%><%kumm4%><%kummgl4%><%kummgk4%><%kummpk4%><%kummauf4%> 
 
Rohertrag<%jetztrohertrag%><%jetztglrohertrag%><%jetztgkrohertrag%><%jetztpkrohertrag%><%jetztaufrohertrag%><%kummrohertrag%><%kummglrohertrag%><%kummgkrohertrag%><%kummpkrohertrag%><%kummaufrohertrag%> 
 
So.betr.Erlöse<%jetzt5%><%jetztgl5%><%jetztgk5%><%jetztpk5%><%kumm5%><%kummgl5%><%kummgk5%><%kummpk5%> 
 
Betriebl. Rohertrag<%jetztbetriebrohertrag%><%jetztglbetriebrohertrag%><%jetztgkbetriebrohertrag%><%jetztpkbetriebrohertrag%><%jetztaufbetriebrohertrag%><%kummbetriebrohertrag%><%kummglbetriebrohertrag%><%kummgkbetriebrohertrag%><%kummpkbetriebrohertrag%><%kummaufbetriebrohertrag%> 
 
Kostenarten: 
Personalkosten<%jetzt10%><%jetztgl10%><%jetztgk10%><%jetztpk10%><%kumm10%><%kummgl10%><%kummgk10%><%kummpk10%> 
Raumkosten<%jetzt11%><%jetztgl11%><%jetztgk11%><%jetztpk11%><%kumm11%><%kummgl11%><%kummgk11%><%kummpk11%> 
Betriebl.Steuern<%jetzt12%><%jetztgl12%><%jetztgk12%><%jetztpk12%><%kumm12%><%kummgl12%><%kummgk12%><%kummpk12%> 
Versich./Beiträge<%jetzt13%><%jetztgl13%><%jetztgk13%><%jetztpk13%><%kumm13%><%kummgl13%><%kummgk13%><%kummpk13%> 
Kfz-Kosten (o.St.)<%jetzt14%><%jetztgl14%><%jetztgk14%><%jetztpk14%><%kumm14%><%kummgl14%><%kummgk14%><%kummpk14%> 
Werbe-/Reisekosten<%jetzt15%><%jetztgl15%><%jetztgk15%><%jetztpk15%><%kumm15%><%kummgl15%><%kummgk15%><%kummpk15%> 
Kosten Warenabgabe<%jetzt16%><%jetztgl16%><%jetztgk16%><%jetztpk16%><%kumm16%><%kummgl16%> -<%kummgk16%><%kummpk16%> 
Abschreibungen<%jetzt17%><%jetztgl17%><%jetztgk17%><%jetztpk17%><%kumm17%><%kummgl17%><%kummgk17%><%kummpk17%> 
Reparatur/Instandh.<%jetzt18%><%jetztgl18%><%jetztgk18%><%jetztpk18%><%kumm18%><%kummgl18%><%kummgk18%><%kummpk18%> 
Sonstige Kosten<%jetzt20%><%jetztgl20%><%jetztgk20%><%jetztpk20%><%kumm20%><%kummgl20%><%kummgk20%><%kummpk20%> 
Gesamtkosten<%jetztgesamtkosten%><%jetztglgesamtkosten%><%jetztgkgesamtkosten%><%jetztpkgesamtkosten%><%kummgesamtkosten%><%kummglgesamtkosten%><%kummgkgesamtkosten%><%kummpkgesamtkosten%> 
 
Betriebsergebnis<%jetztbetriebsergebnis%><%jetztglbetriebsergebnis%> -<%jetztgkbetriebsergebnis%><%jetztpkbetriebsergebnis%><%kummbetriebsergebnis%><%kummglbetriebsergebnis%> -<%kummgkbetriebsergebnis%><%kummpkbetriebsergebnis%> 
 
Zinsaufwand<%jetzt30%><%jetztgl30%><%jetztgk30%><%jetztpk30%><%kumm30%><%kummgl30%><%kummgk30%><%kummpk30%> 
Übrige Steuern<%jetzt19%><%jetztgl19%><%jetztgk19%><%jetztpk19%><%kumm19%><%kummg191%><%kummgk19%><%kummpk19%> 
Sonst. neutr. Aufwand<%jetzt31%><%jetztgl31%><%jetztgk31%><%jetztpk31%><%kumm31%><%kummgl31%><%kummgk31%><%kummpk31%> 
Neutraler Aufwand<%jetztneutraleraufwand%><%jetztglneutraleraufwand%><%jetztgkneutraleraufwand%><%jetztpkneutraleraufwand%><%kummneutraleraufwand%><%kummglneutraleraufwand%><%kummgkneutraleraufwand%><%kummpkneutraleraufwand%> 
 
Zinserträge<%jetzt32%><%jetztgl32%><%jetztgk32%><%jetztpk32%><%kumm32%><%kummgl32%><%kummgk32%><%kummpk32%> 
Sonst. neutr. Ertr.<%jetzt33%><%jetztgl33%><%jetztgk33%><%jetztpk33%><%kumm33%><%kummgl33%><%kummgk33%><%kummpk33%> 
Verr.kalk.Kosten<%jetzt34%><%jetztgl34%> - <%jetztgk34%><%jetztpk34%><%kumm34%><%kummgl34%><%kummgk34%><%kummpk34%> 
Neutraler Ertrag<%jetztneutralerertrag%><%jetztglneutralerertrag%><%jetztgkneutralerertrag%><%jetztpkneutralerertrag%><%kummneutralerertrag%><%kummglneutralerertrag%><%kummgkneutralerertrag%><%kummpkneutralerertrag%> 
 
Ergebnis vor Steuern<%jetztergebnisvorsteuern%><%jetztglergebnisvorsteuern%><%jetztgkergebnisvorsteuern%><%jetztpkergebnisvorsteuern%><%kummergebnisvorsteuern%><%kummglergebnisvorsteuern%><%kummgkergebnisvorsteuern%><%kummpkergebnisvorsteuern%> 
 
Steuern Eink.u.Ertr.<%jetzt35%><%jetztgl35%><%jetztgk35%><%jetztpk35%><%kumm35%><%kummgl35%><%kummgk35%><%kummpk35%> 
 
Vorläufiges Ergebnis<%jetztergebnis%><%jetztglergebnis%><%jetztgkergebnis%><%jetztpkergebnis%><%kummergebnis%><%kummglergebnis%><%kummgkergebnis%><%kummpkergebnis%> 
 
Währung: Euro - FiBu: LX Office ERP -(Version <%version%>) - Formular: 11.01.2007
- 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 @@ - - - - - Vorschau: UStVa - - - - -

Vorschau Umsatzsteuer-Voranmeldung

-

Zeitraum vom <%fromdate%> bis <%todate%>

- - - - - - - - - - - - - - - - - - - - -
Steuernummer: <%steuernummer%> Datum (<%Datum_heute%>)

- Finanzamt <%FA_Name%>
- <%FA_Strasse%>
- <%FA_PLZ%> <%FA_Ort%>
- Fax: <%FA_FAX%> - 		  - Firma <%company%>
- <%if company_street%> - <%company_street%>
- <%company_city%>
- <%end company_street%> - <%if not company_street%> - <%address%> - <%end company_street%> -

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -<%if not year2007%> - - - - - - - -<%end year2007%> -<%if year2007%> - - - - - - - -<%end year2007%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -<%if not year2007%> - - - - - - - -<%end if year2007%> -<%if year2007%> - - - - - - - -<%end if year2007%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -<%if year2010%> - - - - - - - -<%end if year2010%> - - - - - - - - - - - - - - - - - - - - - - -<%if year2010%> - - - - - - - -<%end if year2010%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
I. Anmeldung der -Umsatzsteuer-Vorauszahlung
Lieferungen und sonstige Leistungen
an innergemeinschaftliche Abnehmer mit USt-IdNr(Spalte 41)<%41%>
neuer Fahrzeuge an Abnehmer ohne USt-IdNr(Spalte 44)<%44%>
neuer Fahrzeuge außerhalb eines Unternehmens(Spalte 49)<%49%>
Weitere steuerfreie Umsätze mit Vorsteuerabzug(Spalte 43)<%43%>
Steuerfreie Umsätze ohne -Vorsteuerabzug.
Umsätze nach § 4 Nr. 8 bis 20 UStG		(Spalte 48)<%48%>
Steuerpflichtige Umsätze
zum Steuersatz von 16 v.H.(Spalte 51)<%51%>
(Spalte 51 rechts)<%511%>
zum Steuersatz von 19 v.H.(Spalte 81)<%81%>
(Spalte 81 rechts)<%811%>
zum Steuersatz von 7 v.H.(Spalte 86)<%86%>(Spalte 86 rechts)<%861%>
andere Steuersätze35 <%35%>36<%36%>
 
Lieferungen in das übrige Gemeinschaftsgebiet mit USt-IdNr(Spalte 77)<%77%>
Umsätze, nach §24 UStG (Sägewerkserzeugnisse, alkoholische Getränke etc.)76 <%76%>80<%80%>
 
Innergemeinschaftliche Erwerbe
Steuerfrei nach §4b UStG(Spalte 91)<%91%>
Steuerpflichtige zum Steuersatz von 16 v.H.(Spalte 97)<%97%>
(Spalte 97 rechts)<%971%>
Steuerpflichtige zum Steuersatz von 19 v.H.(Spalte 89)<%89%>
(Spalte 89 rechts)<%891%>
zum Steuersatz von 7 v.H.(Spalte 93)<%93%>(Spalte 93 rechts)<%931%>
zu anderen Steuersätzen(Spalte 95)<%95%>98<%98%>
neuer Fahrzeuge von Lieferern - von Lieferanten ohne USt.IdNr.
- zum allgemeinen Steuersatz		(Spalte 94)<%94%>(Spalte 96)<%96%>
 
Lieferungen des ersten Abnehmers bei - innergemeinschaftlichen Dreiecksgeschften (§25b Abs. 2 UStG)42<%42%>
Steuerpflichtige Umstze im Sinne, für die der - Leistungsempfänger die Steuer schuldet60<%60%>
Nicht steuerbare Leistungen gem. § 18b Satz 1 Nr. 2 UStG21<%21%>
Im Inland nicht steuerbare Umsätze45<%45%>
 
Übertrag(Zeile 43)<%Z43%>
Übertrag(Zeile 45)<%Z45%>
Im Inland steuerpflichtige sonstige Leistungen von im übrigen Gemeinschaftsgebiet ansässigen Unternehmen (§13b Abs. 1 UStG)46<%46%>47<%47%>
Leistungen eines im Ausland ansässigen Unternehmers52<%52%>53<%53%>
Lieferungen sicherungsbereigneter Gegenstände und - Umsätze, die unter das GrEStG fallen.73<%73%>74<%74%>
Bauleistungen eines im Inland ansässigen Unternehmers84<%84%>85<%85%>
Steuer wegen Wechsel der Besteuerungsform und - Nachsteuer auf versteuerte Anzahlungen wegen Steuersatzerhöhung.65<%65%>
 
Umsatzsteuer(Zeile 53)<%Z53%>
 
Abziehbare Vorsteuerbeträge
Vorsteuerbeträge von Rechnungen von anderen Unternehmern(Spalte 66)<%66%>
Vorsteuerbeträge aus dem innergemeinschaftlichen Erwerb61<%61%>
Entrichtete Einfuhrumsatzsteuer62<%62%>
Vorsteuerbeträge aus Leistungen im Sinne - des §13b Abs. 1 UStG67<%67%>
Vorsteuerbeträge, die nach allgemeinen - Durchschnittsästzen berechnet sind 63<%63%>
Berichtigung des Vorsteuerabzugs64<%64%>
Vorsteuerabzug für innergemeinschaftliche Lieferungen - neuer Fahrzeuge außerhalb eines Unternehmens sowie von Kleinunternehmern59<%59%>
Verbleibender Betrag(Zeile 62)<%Z62%>
Andere Steuerbeträge
in Rechnungen unrichtig oder unberechtigt ausgewiesene - Steuerbeträge sowie Steuerbeträge, die nach - §4 Nr. 4a, § 6a Abs. 4, §7 oder §25b UStG geschuldet werden69<%69%>
 
Umsatzsteuer-Vorauszahlung/Überschuss(Zeile 65)<%Z65%>
Anrechnung (Abzug) der festgesetzten Sondervorauszahlung - für Dauerfristverlängerung (nur in der letzten Voranmeldung des - Besteuerungszeitraums, ausfüllen)39<%39%>
 
Verbleibende Umsatzsteuer-Vorauszahlung bzw. - Verbleibender Überschuss83<%83%>
-<%if FA_steuerberater%> -

-Steuerberater:
-<%FA_steuerberater_name%>
-<%FA_steuerberater_street%>
-<%FA_steuerberater_city%>
-Tel: <%FA_steuerberater_tel%>

-<%end FA_steuerberater%> - - 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 @@ - - - - - <%elsterFFFF%><%elstersteuernummer%> - <%year%> - <%period%> - -<%foreach id%> - <%amount%> -<%end%> - - - 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 @@ [% 'Setup Templates' | $T8 %] - [% L.select_tag('mastertemplates', all_master_templates, default = 'German') %] + [% L.select_tag('mastertemplates', all_master_templates, default = 'Standard') %] [% 'Setup Menu' | $T8 %] @@ -254,4 +254,3 @@ }); --> - -- 2.20.1