From: Jan Büren Date: Wed, 11 Jan 2012 14:30:35 +0000 (+0100) Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp X-Git-Tag: release-2.7.0beta1~61^2~1^2 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/6eee850259ed40762406faecaa0cd302bcdf10c6?hp=e83691e94c3fa3736daf1c3da5f2152789c68651 Merge branch 'master' of vc.linet-services.de:public/lx-office-erp --- diff --git a/SL/WH.pm b/SL/WH.pm index 352ca1af8..f760f5e9b 100644 --- a/SL/WH.pm +++ b/SL/WH.pm @@ -620,6 +620,11 @@ sub get_warehouse_report { push @filter_vars, '%' . $filter{ean} . '%'; } + if ($filter{date}) { + push @filter_ary, "i.itime <= ?"; + push @filter_vars, $filter{date}; + } + # prepare qty comparison for later filtering my ($f_qty_op, $f_qty, $f_qty_base_unit); diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl index 45d807e2b..37353dcca 100644 --- a/bin/mozilla/do.pl +++ b/bin/mozilla/do.pl @@ -174,7 +174,7 @@ sub order_links { 'ids' => $form->{id}); $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes currency)); - $form->{shipto} = 1 if $form->{id}; + $form->{shipto} = 1 if $form->{id} || $form->{convert_from_oe_ids}; # get customer / vendor if ($form->{vc} eq 'vendor') { @@ -782,6 +782,7 @@ sub invoice { require "bin/mozilla/$form->{script}"; my $currency = $form->{currency}; + $form->{shipto} = 1 if $form->{convert_from_do_ids}; invoice_links(); if ($form->{ordnumber}) { diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl index 6ed1e4c44..f4f87cc8f 100644 --- a/bin/mozilla/gl.pl +++ b/bin/mozilla/gl.pl @@ -1312,6 +1312,7 @@ sub post_transaction { my $debitcount = 0; my $creditcount = 0; my $debitcredit; + my %split_safety = (); my @flds = qw(accno debit credit projectnumber fx_transaction source memo tax taxchart); @@ -1325,6 +1326,9 @@ sub post_transaction { push @a, {}; $debitcredit = ($form->{"debit_$i"} == 0) ? "0" : "1"; + $split_safety{ $form->{"debit_$i"} <=> 0 }++; + $split_safety{ - $form->{"credit_$i"} <=> 0 }++; + if ($debitcredit) { $debitcount++; } else { @@ -1388,6 +1392,10 @@ sub post_transaction { $count++; } + if ($split_safety{-1} > 1 && $split_safety{1} > 1) { + $::form->error($::locale->text("Split entry detected. The values you have entered will result in an entry with more than one position on both debit and credit. Due to known problems involving accounting software Lx-Office does not allow these.")); + } + for my $i (1 .. $count) { my $j = $i - 1; for (@flds) { $form->{"${_}_$i"} = $a[$j]->{$_} } diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index 489a6d936..bcbf10782 100644 --- a/bin/mozilla/is.pl +++ b/bin/mozilla/is.pl @@ -387,7 +387,6 @@ sub form_footer { $main::auth->assert('invoice_edit'); $form->{invtotal} = $form->{invsubtotal}; - $form->{oldinvtotal} = $form->{invtotal}; # note rows $form->{rows} = max 2, @@ -447,6 +446,8 @@ sub form_footer { $totalpaid += $form->{"paid_$i"}; } + $form->{oldinvtotal} = $form->{invtotal}; + print $form->parse_html_template('is/form_footer', { is_type_credit_note => ($form->{type} eq "credit_note"), totalpaid => $totalpaid, diff --git a/bin/mozilla/menuv4.pl b/bin/mozilla/menuv4.pl index e9e7ac499..25d7d792c 100644 --- a/bin/mozilla/menuv4.pl +++ b/bin/mozilla/menuv4.pl @@ -126,7 +126,7 @@ sub print_menu { my $h = print_menu($menu, "${parent}${item}", $depth * 1 + 1)."\n"; if (!$parent) { - $html .= qq|

${menu_text}

\n|; + $html .= qq|

${menu_text}

\n|; } else { $html .= qq|

${menu_text}

${h}

\n|; } diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index dd1d8e2c7..40a9b4e02 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -240,7 +240,7 @@ sub order_links { $form->{"$form->{vc}_id"} ||= $form->{"all_$form->{vc}"}->[0]->{id} if $form->{"all_$form->{vc}"}; $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes shipto_id currency)); - $form->{shipto} = 1 if $form->{id}; + $form->{shipto} = 1 if $form->{id} || $form->{convert_from_oe_ids}; # get customer / vendor IR->get_vendor(\%myconfig, \%$form) if $form->{type} =~ /(purchase_order|request_quotation)/; diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl index aaf47ff5f..a339cd41a 100644 --- a/bin/mozilla/rp.pl +++ b/bin/mozilla/rp.pl @@ -644,7 +644,7 @@ sub generate_trial_balance { my @options; - $form->{template_fromto} = $locale->date(\%myconfig, $form->{fromdate}, 0) . " - " . $locale->date(\%myconfig, $form->{todate}, 0); + $form->{template_fromto} = $locale->date(\%myconfig, $form->{fromdate}, 0) . " - " . $locale->date(\%myconfig, $form->{todate}, 0); $form->{print_date} = $locale->text('Create Date') . " " . $locale->date(\%myconfig, $form->current_date(\%myconfig), 0); push (@options, $form->{print_date}); @@ -655,6 +655,28 @@ sub generate_trial_balance { $form->{template_to} = $locale->date(\%myconfig, $form->{todate}, 0); + my @custom_headers = ([ + { text => $::locale->text('Account'), rowspan => 2, }, + { text => $::locale->text('Description'), rowspan => 2, }, + { text => $::locale->text('Last Transaction'), rowspan => 2, }, + { text => $::locale->text('Starting Balance'), colspan => 2, }, + { text => $::locale->text('Sum for') . " $form->{template_fromto}", colspan => 2, }, + { text => $::locale->text('Sum per') . " $form->{template_to}", colspan => 2, }, + { text => $::locale->text('Saldo per') . " $form->{template_to}", colspan => 2, }, + ], [ + { text => '', }, + { text => '', }, + { text => '', }, + { text => $::locale->text('Assets'), }, + { text => $::locale->text('Equity'), }, + { text => $::locale->text('Debit'), }, + { text => $::locale->text('Credit'), }, + { text => $::locale->text('Debit'), }, + { text => $::locale->text('Credit'), }, + { text => $::locale->text('Debit'), }, + { text => $::locale->text('Credit'), }, + ]); + $report->set_options('output_format' => 'HTML', 'top_info_text' => join("\n", @options), 'title' => $form->{title}, @@ -662,6 +684,7 @@ sub generate_trial_balance { 'html_template' => 'rp/html_report_susa', 'pdf_template' => 'rp/html_report_susa', ); + $report->set_custom_headers(@custom_headers); $report->set_options_from_form(); $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv'; diff --git a/bin/mozilla/wh.pl b/bin/mozilla/wh.pl index 2b49ba00c..62be1d1d7 100644 --- a/bin/mozilla/wh.pl +++ b/bin/mozilla/wh.pl @@ -824,7 +824,7 @@ sub generate_report { my @columns = qw(warehousedescription bindescription partnumber partdescription chargenumber bestbefore qty stock_value); # filter stuff - map { $filter{$_} = $form->{$_} if ($form->{$_}) } qw(warehouse_id bin_id partnumber description chargenumber bestbefore); + map { $filter{$_} = $form->{$_} if ($form->{$_}) } qw(warehouse_id bin_id partnumber description chargenumber bestbefore date); $filter{qty_op} = WH->convert_qty_op($form->{qty_op}); if ($filter{qty_op}) { diff --git a/css/menuv4.css b/css/menuv4.css index 2fdd7cebe..b59efc264 100644 --- a/css/menuv4.css +++ b/css/menuv4.css @@ -26,11 +26,11 @@ padding:1px 0 1px 3px; content:" "; } #menu h2:after { - content:" "; + content:" "; } #menu h2 { color:#fff; -padding:2 15px +padding:2px 10px; } #menu a, #menu a:visited, #menu div.x, #menu div.x:visited { diff --git a/doc/changelog b/doc/changelog index 632922c42..28cb78637 100644 --- a/doc/changelog +++ b/doc/changelog @@ -85,8 +85,7 @@ - Bugfix 1756: Ertrag in Bruttorechnungen korrekt berechnen - Bugfix 1760 - 1760: Bei einem Lieferschein wird die Abteilung nicht mitgespeichert - Bugfix 1752: Rechnung -> Druckvorschau ignoriert Ãnderung des Steuersatz beim Beleg - - + - Bugfix 1708: Fehlender Ãbertrag der Lieferadresse von Angebot -> AuftragsbestÃ¤tigung 2011-06-15 - Release 2.6.3 diff --git a/locale/de/all b/locale/de/all index 6e5013b2f..a78038734 100644 --- a/locale/de/all +++ b/locale/de/all @@ -1407,7 +1407,7 @@ $self->{texts} = { 'Proforma Invoice' => 'Proformarechnung', 'Program' => 'Programm', 'Project' => 'Projekt', - 'Project Description' => '', + 'Project Description' => 'Projektbeschreibung', 'Project Number' => 'Projektnummer', 'Project Number missing!' => 'Projektnummer fehlt!', 'Project Numbers' => 'Projektnummern', @@ -1635,6 +1635,7 @@ $self->{texts} = { 'Source bank account' => 'Quellkonto', 'Source bin' => 'Quelllagerplatz', 'Space' => 'Leerzeichen', + 'Split entry detected. The values you have entered will result in an entry with more than one position on both debit and credit. Due to known problems involving accounting software Lx-Office does not allow these.' => 'Splitbuchung! Die eingebenen Werte wÃ¼rden eine Buchung auslÃ¶sen, die jeweils mehr als eine Position auf Soll und Haben hÃ¤tte. Um KompatibilitÃ¤t mit DATEV zu gewÃ¤hrleisten erlaubt Lx-Office keine Splitbuchungen.', 'Spoolfile' => 'Druckdatei', 'Start Dunning Process' => 'Mahnprozess starten', 'Start analysis' => 'Analyse beginnen', @@ -1655,6 +1656,7 @@ $self->{texts} = { 'Step 3 of 3: Default units' => 'Schritt 3 von 3: Standardeinheiten', 'Steuersatz' => 'Steuersatz', 'Stock' => 'Einlagern', + 'Stock Qty for Date' => 'Lagerbestand am', 'Stock value' => 'Bestandswert', 'Stocked Qty' => 'Lagermenge', 'Storno' => 'Storno', diff --git a/templates/print/German/ustva-2010.tex b/templates/print/German/ustva-2010.tex new file mode 100644 index 000000000..0192a08b3 --- /dev/null +++ b/templates/print/German/ustva-2010.tex @@ -0,0 +1,153 @@ +% 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-2010.pdf}}}%Seite 2 +{\protect\scalebox{1.045}[1.045]{\protect\includegraphics[viewport = 70 700 700 790,page=1]{ustva-2010.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-2011.tex b/templates/print/German/ustva-2011.tex new file mode 100644 index 000000000..0439373eb --- /dev/null +++ b/templates/print/German/ustva-2011.tex @@ -0,0 +1,153 @@ +% 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-2011.pdf}}}%Seite 2 +{\protect\scalebox{1.045}[1.045]{\protect\includegraphics[viewport = 70 700 700 790,page=1]{ustva-2011.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/webpages/wh/report_filter.html b/templates/webpages/wh/report_filter.html index affe4c265..a5cbe12d8 100644 --- a/templates/webpages/wh/report_filter.html +++ b/templates/webpages/wh/report_filter.html @@ -1,4 +1,5 @@ [%- USE T8 %] +[%- USE L %] [% USE HTML %][% USE JavaScript %]