Merge branch 'master' of github.com:kivitendo/kivitendo-erp

diff --git a/SL/AP.pm b/SL/AP.pm
index 9215ab7..8c49bb3 100644 (file)
--- a/SL/AP.pm
+++ b/SL/AP.pm
@@ -703,7 +703,7 @@ sub setup_form {
   my ($self, $form, $for_post_payments) = @_;
 
   my ($exchangerate, $i, $j, $k, $key, $akey, $ref, $index, $taxamount, $totalamount, $totaltax, $totalwithholding, $withholdingrate,
-      $taxincluded, $tax, $diff);
+      $tax, $diff);
 
   # forex
   $form->{forex} = $form->{exchangerate};
@@ -807,7 +807,6 @@ sub setup_form {
     }
   }
 
-  $form->{taxincluded}  = $taxincluded if ($form->{id});
   $form->{paidaccounts} = 1            if not defined $form->{paidaccounts};
 
   if ($form->{taxincluded} && $form->{taxrate} && $totalamount) {

diff --git a/SL/AR.pm b/SL/AR.pm
index adffeb6..80fc8ef 100644 (file)
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -638,7 +638,7 @@ sub setup_form {
   my ($self, $form, $for_post_payments) = @_;
 
   my ($exchangerate, $akey, $j, $k, $index, $taxamount, $totaltax, $taxrate, $diff, $totalwithholding, $withholdingrate,
-      $totalamount, $taxincluded, $tax);
+      $totalamount, $tax);
 
   # forex
   $form->{forex} = $form->{exchangerate};
@@ -722,7 +722,6 @@ sub setup_form {
     }
   }
 
-  $form->{taxincluded}  = $taxincluded if ($form->{id});
   $form->{paidaccounts} = 1            if not defined $form->{paidaccounts};
 
   if ($form->{taxincluded} && $form->{taxrate} && $totalamount) {

diff --git a/SL/Form.pm b/SL/Form.pm
index 56acec2..f0500d3 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -2101,10 +2101,10 @@ sub _get_taxcharts {
   if (ref $params eq 'HASH') {
     $key = $params->{key} if ($params->{key});
     if ($params->{module} eq 'AR') {
-      push @where, 'taxkey NOT IN (8, 9, 18, 19)';
+      push @where, 'chart_categories ~ \'[ACILQ]\'';
 
     } elsif ($params->{module} eq 'AP') {
-      push @where, 'taxkey NOT IN (1, 2, 3, 12, 13)';
+      push @where, 'chart_categories ~ \'[ACELQ]\'';
     }
 
   } elsif ($params) {

diff --git a/SL/InstallationCheck.pm b/SL/InstallationCheck.pm
index bfbc1c6..947be97 100644 (file)
--- a/SL/InstallationCheck.pm
+++ b/SL/InstallationCheck.pm
@@ -56,7 +56,9 @@ BEGIN {
 );
 
 @developer_modules = (
+  { name => "DBIx::Log4perl",                      url => "http://search.cpan.org/~mjevans/", },
   { name => "Devel::REPL",                         url => "http://search.cpan.org/~doy/",       debian => 'libdevel-repl-perl' },
+  { name => "Log::Log4perl",                       url => "http://search.cpan.org/~mschilli/",  debian => 'liblog-log4perl-perl' },
   { name => "LWP::Simple",                         url => "http://search.cpan.org/~gaas/",      debian => 'libwww-perl', dist_name => 'libwww-perl' },
   { name => "Moose::Role",                         url => "http://search.cpan.org/~doy/",       debian => 'libmoose-role-perl' },
   { name => "Perl::Tags",                          url => "http://search.cpan.org/~osfameron/", debian => 'libperl-tags-perl' },

diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl
index c2fd6a2..4bef1d2 100644 (file)
--- a/bin/mozilla/ca.pl
+++ b/bin/mozilla/ca.pl
@@ -153,7 +153,7 @@ sub list {
   $::lxdebug->enter_sub;
   $::auth->assert('report');
 
-  $::form->{title} = $::locale->text('List Transactions') . " - " . $::locale->text('Account') . " $::form->{accno}";
+  $::form->{title} = $::locale->text('List Transactions') . " - " . $::locale->text('Account') . " $::form->{accno}" . " - " . $::form->{description};
 
   $::form->header;
   print $::form->parse_html_template('ca/list', {

diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index 5a3f5e8..bad6e4f 100644 (file)
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -328,7 +328,6 @@ sub form_header {
     shiptoname shiptostreet shiptozipcode shiptocity shiptocountry  shiptocontact shiptophone shiptofax
     shiptoemail shiptodepartment_1 shiptodepartment_2 message email subject cc bcc taxaccounts cursor_fokus
     convert_from_do_ids convert_from_oe_ids show_details gldate
-    rowcount callback draft_id draft_description vendor_discount
   ), @custom_hiddens,
   map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}];
 

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 1650303..cf3ac57 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -378,7 +378,7 @@ sub form_header {
     shiptoname shiptostreet shiptozipcode shiptocity shiptocountry  shiptocontact shiptophone shiptofax
     shiptoemail shiptodepartment_1 shiptodepartment_2  shiptocp_gender message email subject cc bcc taxaccounts cursor_fokus
     convert_from_do_ids convert_from_oe_ids
-    show_details rowcount callback draft_id draft_description customer_discount gldate
+    show_details
   ), @custom_hiddens,
   map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}];
 

diff --git a/doc/changelog b/doc/changelog
index beaa2b5..28da896 100644 (file)
--- a/doc/changelog
+++ b/doc/changelog
@@ -105,7 +105,8 @@ Wichtige Änderungen:
 
 Bugfixes:
  - Punkt in Belegnummer korrekt für WebDAV File Feature escapt (Bug 2394)
-
+ - Stornierte Rechnungen (sowohl die Stornorechnung als auch das Storno nicht
+   Buchen oder Löschen, egal was in der Mandantenkonfiguration steht)
 
 2012-12-10 - Release 3.0.0
 

diff --git a/templates/print/Standard/credit_note.tex b/templates/print/Standard/credit_note.tex
index 3dd8b58..12538f4 100755 (executable)
--- a/templates/print/Standard/credit_note.tex
+++ b/templates/print/Standard/credit_note.tex
@@ -37,7 +37,7 @@
 \newcommand{\employeeemail}{$(employee_email)$}
 \newcommand{\employeecoustid}{$(employee_co_ustid)$}
 \newcommand{\employeetaxnumber}{$(employee_taxnumber)$}
-\newcommand{\employeetable}{tabelle$(employee_login)$.tex}
+\newcommand{\employeetable}{$(template_meta.tmpfile NOESCAPE)$.table.tex}
 
 % ---------- Eigene Bankverbindung falls nicht im Briefkopf gesetzt ----------
 % \newcommand{\companybank}{$(company_bank)$}
@@ -99,11 +99,10 @@
 \newcommand{\shiptofax}{$(shiptofax)$}
 
 % ---------- Währungszeichen ----------
-\newcommand{\currency}{$(currency)$}
-\ifthenelse{\equal{\currency}{EUR}}{\let\currency\euro}{}
-\ifthenelse{\equal{\currency}{YEN}}{\let\currency\textyen}{}
-\ifthenelse{\equal{\currency}{GBP}}{\let\currency\pounds}{}
-\ifthenelse{\equal{\currency}{USD}}{\let\currency\$}{}
+\newcommand{\currency}{\euro}
+\ifthenelse{\equal{$(currency)$}{YEN}}{\let\currency\textyen}{}
+\ifthenelse{\equal{$(currency)$}{GBP}}{\let\currency\pounds}{}
+\ifthenelse{\equal{$(currency)$}{USD}}{\let\currency\$}{}
 
 % ---------- Ende Reportvariablen-Umsetzung ----------
 
@@ -208,7 +207,7 @@ $(foreach number)$
        \ifthenelse{\isempty{$(sellprice)$}}{&}{
                \numprint{$(sellprice)$}
                \ifthenelse{\equal{$(p_discount)$}{0}}{}{ -$(p_discount)$\%} &
-               \numprint{$(linetotal)$}\Wert{$(linetotal NOFORMAT)$}  
+               \numprint{$(linetotal)$}\Wert{$(linetotal NOFORMAT)$}
        }\\ %
   $(end number)$
 
@@ -229,7 +228,7 @@ $(foreach number)$
 %       {$(taxdescription)$ auf }\numprint{$(taxbase)$}~\currency: & \numprint{$(tax)$}& \\
                {$(taxdescription)$}:  & \numprint{$(tax)$}& \currency\\
    $(end tax)$
-   \midrule 
+   \midrule
    {\textbf{Rechnungsbetrag:}} & \bfseries\numprint{\invtotal} & \textbf{\currency}\\
 % ---------- Wenn bereits etwas gezahlt wurde ----------
 $(if invtotal != total)$

diff --git a/templates/print/Standard/invoice.tex b/templates/print/Standard/invoice.tex
index 78710fd..be93079 100644 (file)
--- a/templates/print/Standard/invoice.tex
+++ b/templates/print/Standard/invoice.tex
@@ -37,7 +37,7 @@
 \newcommand{\employeeemail}{$(employee_email)$}
 \newcommand{\employeecoustid}{$(employee_co_ustid)$}
 \newcommand{\employeetaxnumber}{$(employee_taxnumber)$}
-\newcommand{\employeetable}{tabelle$(employee_login)$.tex}
+\newcommand{\employeetable}{$(template_meta.tmpfile NOESCAPE)$.table.tex}
 
 % ---------- Eigene Bankverbindung falls nicht im Briefkopf gesetzt ----------
 % \newcommand{\companybank}{$(company_bank)$}
@@ -98,11 +98,10 @@
 \newcommand{\shiptofax}{$(shiptofax)$}
 
 % ---------- Währungszeichen ----------
-\newcommand{\currency}{$(currency)$}
-\ifthenelse{\equal{\currency}{EUR}}{\let\currency\euro}{}
-\ifthenelse{\equal{\currency}{YEN}}{\let\currency\textyen}{}
-\ifthenelse{\equal{\currency}{GBP}}{\let\currency\pounds}{}
-\ifthenelse{\equal{\currency}{USD}}{\let\currency\$}{}
+\newcommand{\currency}{\euro}
+\ifthenelse{\equal{$(currency)$}{YEN}}{\let\currency\textyen}{}
+\ifthenelse{\equal{$(currency)$}{GBP}}{\let\currency\pounds}{}
+\ifthenelse{\equal{$(currency)$}{USD}}{\let\currency\$}{}
 
 % ---------- Ende Reportvariablen-Umsetzung ----------
 
@@ -142,10 +141,10 @@
 % ---------- Begrüßung und Bemerkungen ----------
 \vspace{ 5mm}
 \lettergreeting
-Hiermit erlauben wir uns, Ihnen die nachfolgenden Positionen $(if orddate)$gemäß 
+Hiermit erlauben wir uns, Ihnen die nachfolgenden Positionen $(if orddate)$gemäß
 Ihrem Auftrag vom \orddate{ }$(end)$in Rechnung zu stellen.\\
 
-Für Nachfragen steht Ihnen \employeename \ per Telefon (\employeetel) 
+Für Nachfragen steht Ihnen \employeename \ per Telefon (\employeetel)
 oder per E-Mail (\employeeemail) gerne zur Verfügung.\\[1\baselineskip]
 \ifthenelse{\isempty{$(notes)$}}{}{
       $(notes)$\\[1\baselineskip]
@@ -207,7 +206,7 @@ $(foreach number)$
        \ifthenelse{\isempty{$(sellprice)$}}{&}{
                \numprint{$(sellprice)$}
                \ifthenelse{\equal{$(p_discount)$}{0}}{}{ -$(p_discount)$\%} &
-               \numprint{$(linetotal)$}\Wert{$(linetotal NOFORMAT)$}  
+               \numprint{$(linetotal)$}\Wert{$(linetotal NOFORMAT)$}
        }\\ %
   $(end number)$
 
@@ -228,7 +227,7 @@ $(foreach number)$
 %       {$(taxdescription)$ auf }\numprint{$(taxbase)$}~\currency: & \numprint{$(tax)$}& \\
                {$(taxdescription)$}:  & \numprint{$(tax)$}& \currency\\
    $(end tax)$
-   \midrule  
+   \midrule
    {\textbf{Rechnungsbetrag:}} & \bfseries\numprint{\invtotal} & \textbf{\currency}\\
 % ---------- Wenn bereits etwas gezahlt wurde ----------
 $(if invtotal != total)$
@@ -270,7 +269,7 @@ $(end)$
 % ---------- Nachbemerkung mit max. Abstand nach unten ----------
 $(if payment_terms)$
 \vspace*{0.5em}
-\textbf{Zahlungsbedingungen:}\hfill\parbox[t]{0.7\textwidth}{$(payment_terms)$}\\ 
+\textbf{Zahlungsbedingungen:}\hfill\parbox[t]{0.7\textwidth}{$(payment_terms)$}\\
 $(end)$
 \vspace*{0.5em}
 %Bitte überweisen Sie den Rechnungsbetrag in Höhe von

diff --git a/templates/print/Standard/mahnung.tex b/templates/print/Standard/mahnung.tex
index d534769..5da19ac 100644 (file)
--- a/templates/print/Standard/mahnung.tex
+++ b/templates/print/Standard/mahnung.tex
@@ -36,7 +36,7 @@
 \newcommand{\employeeemail}{$(employee_email)$}
 \newcommand{\employeecoustid}{$(employee_co_ustid)$}
 \newcommand{\employeetaxnumber}{$(employee_taxnumber)$}
-\newcommand{\employeetable}{tabelle$(employee_login)$.tex}
+\newcommand{\employeetable}{$(template_meta.tmpfile NOESCAPE)$.table.tex}
 
 % ---------- Eigene Bankverbindung falls nicht im Briefkopf gesetzt ----------
 % \newcommand{\companybank}{$(company_bank)$}
@@ -101,11 +101,10 @@
 \newcommand{\shiptofax}{$(shiptofax)$}
 
 % ---------- Währungszeichen ----------
-\newcommand{\currency}{$(currency)$}
-\ifthenelse{\equal{\currency}{EUR}}{\let\currency\euro}{}
-\ifthenelse{\equal{\currency}{YEN}}{\let\currency\textyen}{}
-\ifthenelse{\equal{\currency}{GBP}}{\let\currency\pounds}{}
-\ifthenelse{\equal{\currency}{USD}}{\let\currency\$}{}
+\newcommand{\currency}{\euro}
+\ifthenelse{\equal{$(currency)$}{YEN}}{\let\currency\textyen}{}
+\ifthenelse{\equal{$(currency)$}{GBP}}{\let\currency\pounds}{}
+\ifthenelse{\equal{$(currency)$}{USD}}{\let\currency\$}{}
 
 % ---------- Ende Reportvariablen-Umsetzung ----------
 
@@ -164,7 +163,7 @@ $(foreach dn_invnumber)$
   $(dn_amount)$ \euro & $(dn_fee)$  \euro & $(dn_interest)$  \euro & $(dn_linetotal)$   \euro \\[1pt]
 $(end dn_invnumber)$
 \cline{1-7}\\
- Insgesamt: & & & $(total_open_amount)$ \euro & $(fee)$ \euro & $(total_interest)$ \euro & \textbf{$(total_amount)$  \euro} 
+ Insgesamt: & & & $(total_open_amount)$ \euro & $(fee)$ \euro & $(total_interest)$ \euro & \textbf{$(total_amount)$  \euro}
 \end{tabular*}
 \rule{\textwidth}{0.5pt}
 

diff --git a/templates/print/Standard/mahnung_invoice.tex b/templates/print/Standard/mahnung_invoice.tex
index a60b698..182db66 100644 (file)
--- a/templates/print/Standard/mahnung_invoice.tex
+++ b/templates/print/Standard/mahnung_invoice.tex
@@ -36,7 +36,7 @@
 \newcommand{\employeeemail}{$(employee_email)$}
 \newcommand{\employeecoustid}{$(employee_co_ustid)$}
 \newcommand{\employeetaxnumber}{$(employee_taxnumber)$}
-\newcommand{\employeetable}{tabelle$(employee_login)$.tex}
+\newcommand{\employeetable}{$(template_meta.tmpfile NOESCAPE)$.table.tex}
 
 % ---------- Eigene Bankverbindung falls nicht im Briefkopf gesetzt ----------
 % \newcommand{\companybank}{$(company_bank)$}
@@ -101,11 +101,10 @@
 \newcommand{\shiptofax}{$(shiptofax)$}
 
 % ---------- Währungszeichen ----------
-\newcommand{\currency}{$(currency)$}
-\ifthenelse{\equal{\currency}{EUR}}{\let\currency\euro}{}
-\ifthenelse{\equal{\currency}{YEN}}{\let\currency\textyen}{}
-\ifthenelse{\equal{\currency}{GBP}}{\let\currency\pounds}{}
-\ifthenelse{\equal{\currency}{USD}}{\let\currency\$}{}
+\newcommand{\currency}{\euro}
+\ifthenelse{\equal{$(currency)$}{YEN}}{\let\currency\textyen}{}
+\ifthenelse{\equal{$(currency)$}{GBP}}{\let\currency\pounds}{}
+\ifthenelse{\equal{$(currency)$}{USD}}{\let\currency\$}{}
 
 % ---------- Ende Reportvariablen-Umsetzung ----------
 

diff --git a/templates/print/Standard/proforma.tex b/templates/print/Standard/proforma.tex
index adefdde..b71f1d3 100644 (file)
--- a/templates/print/Standard/proforma.tex
+++ b/templates/print/Standard/proforma.tex
@@ -37,7 +37,7 @@
 \newcommand{\employeeemail}{$(employee_email)$}
 \newcommand{\employeecoustid}{$(employee_co_ustid)$}
 \newcommand{\employeetaxnumber}{$(employee_taxnumber)$}
-\newcommand{\employeetable}{tabelle$(employee_login)$.tex}
+\newcommand{\employeetable}{$(template_meta.tmpfile NOESCAPE)$.table.tex}
 
 % ---------- eigene Bankverbindung falls nicht im Briefkopf ----------
 % \newcommand{\companybank}{$(company_bank)$}
@@ -91,11 +91,10 @@
 \newcommand{\shiptofax}{$(shiptofax)$}
 
 % ---------- Währung setzen  ----------
-\newcommand{\currency}{$(currency)$}
-\ifthenelse{\equal{\currency}{EUR}}{\let\currency\euro}{}
-\ifthenelse{\equal{\currency}{YEN}}{\let\currency\textyen}{}
-\ifthenelse{\equal{\currency}{GBP}}{\let\currency\pounds}{}
-\ifthenelse{\equal{\currency}{USD}}{\let\currency\$}{}
+\newcommand{\currency}{\euro}
+\ifthenelse{\equal{$(currency)$}{YEN}}{\let\currency\textyen}{}
+\ifthenelse{\equal{$(currency)$}{GBP}}{\let\currency\pounds}{}
+\ifthenelse{\equal{$(currency)$}{USD}}{\let\currency\$}{}
 
 % ---------- Ende Reportvariablen-Umsetzung ----------
 
@@ -199,7 +198,7 @@ nachfolgend aufgeführte Bestellung auf das unten angegebene Konto.
        \ifthenelse{\isempty{$(sellprice)$}}{&}{
                \numprint{$(sellprice)$}
                \ifthenelse{\equal{$(p_discount)$}{0}}{}{ -$(p_discount)$\%} &
-               \numprint{$(linetotal)$}\Wert{$(linetotal NOFORMAT)$}  
+               \numprint{$(linetotal)$}\Wert{$(linetotal NOFORMAT)$}
        }\\ %
   $(end number)$
 

diff --git a/templates/print/Standard/purchase_order.tex b/templates/print/Standard/purchase_order.tex
index 3abc871..8315e1c 100644 (file)
--- a/templates/print/Standard/purchase_order.tex
+++ b/templates/print/Standard/purchase_order.tex
@@ -35,7 +35,7 @@
 \newcommand{\employeeemail}{$(employee_email)$}
 \newcommand{\employeecoustid}{$(employee_co_ustid)$}
 \newcommand{\employeetaxnumber}{$(employee_taxnumber)$}
-\newcommand{\employeetable}{tabelle$(employee_login)$.tex}
+\newcommand{\employeetable}{$(template_meta.tmpfile NOESCAPE)$.table.tex}
 
 % ---------- Eigene Bankverbindung falls nicht im Briefkopf gesetzt ----------
 % \newcommand{\companybank}{$(company_bank)$}
@@ -87,11 +87,10 @@
 \newcommand{\shiptofax}{$(shiptofax)$}
 
 % ---------- Währungszeichen ----------
-\newcommand{\currency}{$(currency)$}
-\ifthenelse{\equal{\currency}{EUR}}{\let\currency\euro}{}
-\ifthenelse{\equal{\currency}{YEN}}{\let\currency\textyen}{}
-\ifthenelse{\equal{\currency}{GBP}}{\let\currency\pounds}{}
-\ifthenelse{\equal{\currency}{USD}}{\let\currency\$}{}
+\newcommand{\currency}{\euro}
+\ifthenelse{\equal{$(currency)$}{YEN}}{\let\currency\textyen}{}
+\ifthenelse{\equal{$(currency)$}{GBP}}{\let\currency\pounds}{}
+\ifthenelse{\equal{$(currency)$}{USD}}{\let\currency\$}{}
 
 % ---------- Ende Reportvariablen-Umsetzung ----------
 
@@ -221,7 +220,7 @@ Bei Fragen zur Bestellung, steht Ihnen \employeename \ per Telefon (\employeetel
 \end{tabular}
 }
 \vfill
-Grundlage dieses Auftrages sind unsere Einkaufsbedingungen. 
+Grundlage dieses Auftrages sind unsere Einkaufsbedingungen.
 Wir bitten um gleichlautende Auftragsbestätigung.\\
 \vspace{1.5\baselineskip}
 

diff --git a/templates/print/Standard/request_quotation.tex b/templates/print/Standard/request_quotation.tex
index 913df1e..d70cd11 100644 (file)
--- a/templates/print/Standard/request_quotation.tex
+++ b/templates/print/Standard/request_quotation.tex
@@ -36,7 +36,7 @@
 \newcommand{\employeeemail}{$(employee_email)$}
 \newcommand{\employeecoustid}{$(employee_co_ustid)$}
 \newcommand{\employeetaxnumber}{$(employee_taxnumber)$}
-\newcommand{\employeetable}{tabelle$(employee_login)$.tex}
+\newcommand{\employeetable}{$(template_meta.tmpfile NOESCAPE)$.table.tex}
 
 % ---------- Adressat ----------
 \newcommand{\name}{$(name)$}
@@ -83,11 +83,10 @@
 \newcommand{\shiptofax}{$(shiptofax)$}
 
 % ---------- Währungszeichen ----------
-\newcommand{\currency}{$(currency)$}
-\ifthenelse{\equal{\currency}{EUR}}{\let\currency\euro}{}
-\ifthenelse{\equal{\currency}{YEN}}{\let\currency\textyen}{}
-\ifthenelse{\equal{\currency}{GBP}}{\let\currency\pounds}{}
-\ifthenelse{\equal{\currency}{USD}}{\let\currency\$}{}
+\newcommand{\currency}{\euro}
+\ifthenelse{\equal{$(currency)$}{YEN}}{\let\currency\textyen}{}
+\ifthenelse{\equal{$(currency)$}{GBP}}{\let\currency\pounds}{}
+\ifthenelse{\equal{$(currency)$}{USD}}{\let\currency\$}{}
 
 % ---------- Ende Reportvariablen-Umsetzung ----------
 

diff --git a/templates/print/Standard/sales_delivery_order.tex b/templates/print/Standard/sales_delivery_order.tex
index bcad78b..51842a8 100644 (file)
--- a/templates/print/Standard/sales_delivery_order.tex
+++ b/templates/print/Standard/sales_delivery_order.tex
@@ -4,7 +4,7 @@
 % Version 2.5 vom 15.Oktober 2011
 % Basiert auf der Arbeit von kmk@lilalaser.de / 2007
 % Diese Vorlage steht unter der GPL-Lizenz, Version 3
-% siehe http://www.gnu.de/licenses/gpl-3.0.html             
+% siehe http://www.gnu.de/licenses/gpl-3.0.html
 % ----------
 % config: tag-style=$( )$
 % ----------
@@ -12,9 +12,9 @@
 \usepackage{fancyhdr}       % Für den Seitenkopf und -Fuß
 \usepackage{ifpdf}          % Erlaubt eine Code-Weiche für PDF, oder DVI Ausgabe
 \usepackage{xifthen}        % Allgemeine Code-Weiche
-\usepackage{graphicx}       % Fuer die Einbindung der Logo-Graphik 
+\usepackage{graphicx}       % Fuer die Einbindung der Logo-Graphik
 \usepackage{german}         % Deutsche Trenn-Tabelle
-\usepackage[utf8]{inputenc} % Umlaute direkt eingeben 
+\usepackage[utf8]{inputenc} % Umlaute direkt eingeben
 \usepackage{textcomp}       % Sonderzeichen
 \usepackage{lastpage}       % Fuer die Angabe "Seite 2 von 5"
 \usepackage{filecontents}   % Um von latex aus eine Datei schreiben zu koennen
@@ -24,8 +24,8 @@
 \newcommand*{\sperren}[1]{\normalsize\textls*[200]{#1}} %Sperrung Überrschriften
 
 
-% ---------- Report-Variablen zur Verwendung in kivitendobriefkopf.tex ---------- 
-% ----------  Die eigenen Daten ---------- 
+% ---------- Report-Variablen zur Verwendung in kivitendobriefkopf.tex ----------
+% ----------  Die eigenen Daten ----------
 \newcommand{\employeename}{$(employee_name)$}
 \newcommand{\employeecompany}{$(employee_company)$}
 \newcommand{\employeeaddress}{$(employee_address)$}
@@ -34,14 +34,14 @@
 \newcommand{\employeeemail}{$(employee_email)$}
 \newcommand{\employeecoustid}{$(employee_co_ustid)$}
 \newcommand{\employeetaxnumber}{$(employee_taxnumber)$}
-\newcommand{\employeetable}{tabelle$(employee_login)$.tex}
+\newcommand{\employeetable}{$(template_meta.tmpfile NOESCAPE)$.table.tex}
 
-% ---------- Eigene Bankverbindung falls nicht im Briefkopf gesetzt ---------- 
+% ---------- Eigene Bankverbindung falls nicht im Briefkopf gesetzt ----------
 % \newcommand{\companybank}{$(company_bank)$}
 % \newcommand{\companybankcode}{$(company_bank_code)$}
 % \newcommand{\companyaccountnumber}{$(company_account_number)$}
 
-% ---------- Adressat ---------- 
+% ---------- Adressat ----------
 \newcommand{\name}{$(name)$}
 \newcommand{\departmentone}{$(department_1)$}
 \newcommand{\departmenttwo}{$(department_2)$}
@@ -56,7 +56,7 @@
 \newcommand{\phone}{$(customerphone)$}
 \newcommand{\fax}{$(customerfax)$}
 \newcommand{\lettergreeting}{
-       \ifthenelse{\equal{$(cp_gender)$}{f}} 
+       \ifthenelse{\equal{$(cp_gender)$}{f}}
         {Sehr geehrte Frau $(cp_name)$,}
        {\ifthenelse{\equal{$(cp_gender)$}{m}}
          {Sehr geehrter Herr $(cp_name)$,}
@@ -64,7 +64,7 @@
        }\\[0.3em]
 }
 
-% ---------- Bestellvariablen ---------- 
+% ---------- Bestellvariablen ----------
 \newcommand{\ordnumber}{$(ordnumber)$}
 \newcommand{\donumber}{$(donumber)$}
 %\newcommand{\donumber}{Lieferschein zu Auftrag Nr. \ordnumber}
@@ -74,7 +74,7 @@
 \newcommand{\reqdate}{$(reqdate)$}
 \newcommand{\kundennummer}{$(customernumber)$}
 
-% ---------- Lieferadresse ---------- 
+% ---------- Lieferadresse ----------
 \newcommand{\shiptoname}{$(shiptoname)$}
 \newcommand{\shiptocontact}{$(shiptocontact)$}
 \newcommand{\shiptodepartmentone}{$(shiptodepartment_1)$}
@@ -86,28 +86,27 @@
 \newcommand{\shiptozipcode}{$(shiptozipcode)$}
 \newcommand{\shiptofax}{$(shiptofax)$}
 
-% ---------- Währungszeichen ---------- 
-\newcommand{\currency}{$(currency)$}
-\ifthenelse{\equal{\currency}{EUR}}{\let\currency\euro}{}
-\ifthenelse{\equal{\currency}{YEN}}{\let\currency\textyen}{}
-\ifthenelse{\equal{\currency}{GBP}}{\let\currency\pounds}{}
-\ifthenelse{\equal{\currency}{USD}}{\let\currency\$}{}
+% ---------- Währungszeichen ----------
+\newcommand{\currency}{\euro}
+\ifthenelse{\equal{$(currency)$}{YEN}}{\let\currency\textyen}{}
+\ifthenelse{\equal{$(currency)$}{GBP}}{\let\currency\pounds}{}
+\ifthenelse{\equal{$(currency)$}{USD}}{\let\currency\$}{}
 
 % ---------- Ende Reportvariablen-Umsetzung ----------
 
-% ---------- Briefkopf dazuladen ---------- 
+% ---------- Briefkopf dazuladen ----------
 \input{kivitendobriefkopf}
 
 \begin{document}
-% ---------- Schrift Hauptdokuments (Computermodern-sanserif)  ---------- 
+% ---------- Schrift Hauptdokuments (Computermodern-sanserif)  ----------
 % \fontfamily{cmss}\fontsize{10}{12pt plus 0.12pt minus 0.1pt}\selectfont
 % ---------- Schrift Helvetica ------------------------
 \fontfamily{phv}\fontsize{10}{12pt plus 0.12pt minus 0.1pt}\selectfont
-% ---------- Firmenlogo nur erste Seite ---------- 
-\thispagestyle{briefkopf}                              
-% ---------- Datum und Nummern ---------- 
+% ---------- Firmenlogo nur erste Seite ----------
+\thispagestyle{briefkopf}
+% ---------- Datum und Nummern ----------
 % Position unterhalb des Briefkopfs
-\vspace*{\vlogospacing}        
+\vspace*{\vlogospacing}
 \renewcommand{\arraystretch}{0.9}
 \begin{minipage}[b]{177mm}
 \sperren{\textbf{Lieferschein Nr. \donumber}}
@@ -120,27 +119,27 @@
                \textbf{Auftrag Nr.} & \ordnumber\\
                \textbf{Lieferschein Nr.} & \donumber\\
                \nonemptyline{\textbf{Vorraussichtl. Lieferdatum:} &}{\reqdate}
-               \textbf{Ansprechpartner} & \employeename\\              
+               \textbf{Ansprechpartner} & \employeename\\
                \nonemptyline{\textbf{Durchwahl} &}{\employeetel}
-               \nonemptyline{\textbf{E-Mail} &}{\employeeemail}                                                
+               \nonemptyline{\textbf{E-Mail} &}{\employeeemail}
        \end{tabular}\\[10mm plus 20mm minus 10mm]
 \end{minipage}
-\renewcommand{\arraystretch}{1}        
+\renewcommand{\arraystretch}{1}
 \normalsize
-% ---------- Begrüßung und Bemerkungen ---------- 
+% ---------- Begrüßung und Bemerkungen ----------
 \vspace{ 5mm}
 %\lettergreeting
 Wir liefern Ihnen gemäß Ihrem Auftrag %
-\ifthenelse{\equal{\orddate}{\leer}}{}{vom \orddate{ }}% 
+\ifthenelse{\equal{\orddate}{\leer}}{}{vom \orddate{ }}%
 die unten aufgeführten Positionen.\\
 Für Nachfragen steht Ihnen \employeename \ per Telefon (\employeetel) oder per E-Mail (\employeeemail) gerne zur Verfügnung.\par
-      
-% ---------- Die eigentliche-Tabelle ---------- 
-% ---------- Tabelle puffern ---------- 
+
+% ---------- Die eigentliche-Tabelle ----------
+% ---------- Tabelle puffern ----------
 \begin{filecontents}{\employeetable}
-% ---------- Spaltendefinition ---------- 
+% ---------- Spaltendefinition ----------
 \begin{longtable}{@{}rlX@{ }rl@{}}
-% ---------- Kopfzeile der Tabelle ---------- 
+% ---------- Kopfzeile der Tabelle ----------
                \textbf{Pos} &
        \textbf{Art.Nr.} &
        \textbf{Bezeichnung} &
@@ -148,7 +147,7 @@ Für Nachfragen steht Ihnen \employeename \ per Telefon (\employeetel) oder per
        \textbf{ME}  \\
        \midrule
   \endfirsthead
-% ---------- Tabellenkopf nach dem Umbruch ---------- 
+% ---------- Tabellenkopf nach dem Umbruch ----------
                \textbf{Pos} &
        \textbf{Art.Nr.} &
        \textbf{Bezeichnung} &
@@ -156,25 +155,25 @@ Für Nachfragen steht Ihnen \employeename \ per Telefon (\employeetel) oder per
        \textbf{ME} \\
         \midrule
   \endhead
-% ---------- Fuss der Teiltabellen ---------- 
+% ---------- Fuss der Teiltabellen ----------
         \midrule
   \endfoot
-% ---------- Das Ende der Tabelle ---------- 
+% ---------- Das Ende der Tabelle ----------
        \midrule
   \endlastfoot
-% ---------- Positionen ---------- 
+% ---------- Positionen ----------
   $(foreach number)$
        $(runningnumber)$ &
        $(number)$ &
        $(description)$ &
        $(qty)$ &
-       $(unit)$ 
-       \\ %       
+       $(unit)$
+       \\ %
   $(end number)$
 \end{longtable}
-% ----------  Ende der Hilfsdatei ---------- 
-\end{filecontents} 
-% ---------- Puffertabelle öffnen ---------- 
+% ----------  Ende der Hilfsdatei ----------
+\end{filecontents}
+% ---------- Puffertabelle öffnen ----------
 \LTXtable{\textwidth}{\employeetable}
 
 \vfill

diff --git a/templates/print/Standard/sales_order.tex b/templates/print/Standard/sales_order.tex
index 048a560..672b802 100644 (file)
--- a/templates/print/Standard/sales_order.tex
+++ b/templates/print/Standard/sales_order.tex
@@ -38,7 +38,7 @@
 \newcommand{\employeeemail}{$(employee_email)$}
 \newcommand{\employeecoustid}{$(employee_co_ustid)$}
 \newcommand{\employeetaxnumber}{$(employee_taxnumber)$}
-\newcommand{\employeetable}{tabelle$(employee_login)$.tex}
+\newcommand{\employeetable}{$(template_meta.tmpfile NOESCAPE)$.table.tex}
 
 % ---------- Eigene Bankverbindung falls nicht im Briefkopf gesetzt ----------
 % \newcommand{\companybank}{$(company_bank)$}
@@ -91,11 +91,10 @@
 \newcommand{\shiptofax}{$(shiptofax)$}
 
 % ---------- Währungszeichen ----------
-\newcommand{\currency}{$(currency)$}
-\ifthenelse{\equal{\currency}{EUR}}{\let\currency\euro}{}
-\ifthenelse{\equal{\currency}{YEN}}{\let\currency\textyen}{}
-\ifthenelse{\equal{\currency}{GBP}}{\let\currency\pounds}{}
-\ifthenelse{\equal{\currency}{USD}}{\let\currency\$}{}
+\newcommand{\currency}{\euro}
+\ifthenelse{\equal{$(currency)$}{YEN}}{\let\currency\textyen}{}
+\ifthenelse{\equal{$(currency)$}{GBP}}{\let\currency\pounds}{}
+\ifthenelse{\equal{$(currency)$}{USD}}{\let\currency\$}{}
 
 % ---------- Ende Reportvariablen-Umsetzung ----------
 
@@ -198,7 +197,7 @@ und bestätigen Ihnen diesen wie folgt.\\
        \ifthenelse{\isempty{$(sellprice)$}}{&}{
                \numprint{$(sellprice)$}
                \ifthenelse{\equal{$(p_discount)$}{0}}{}{ -$(p_discount)$\%} &
-               \numprint{$(linetotal)$}\Wert{$(linetotal NOFORMAT)$}  
+               \numprint{$(linetotal)$}\Wert{$(linetotal NOFORMAT)$}
        }\\ %
   $(end number)$
 

diff --git a/templates/print/Standard/sales_quotation.tex b/templates/print/Standard/sales_quotation.tex
index f608ca0..356f685 100644 (file)
--- a/templates/print/Standard/sales_quotation.tex
+++ b/templates/print/Standard/sales_quotation.tex
@@ -38,7 +38,7 @@
 \newcommand{\employeeemail}{$(employee_email)$}
 \newcommand{\employeecoustid}{$(employee_co_ustid)$}
 \newcommand{\employeetaxnumber}{$(employee_taxnumber)$}
-\newcommand{\employeetable}{tabelle$(employee_login)$.tex}
+\newcommand{\employeetable}{$(template_meta.tmpfile NOESCAPE)$.table.tex}
 
 % ---------- Eigene Bankverbindung falls nicht im Briefkopf gesetzt ----------
 % \newcommand{\companybank}{$(company_bank)$}
@@ -88,11 +88,10 @@
 \newcommand{\shiptofax}{$(shiptofax)$}
 
 % ---------- Währungszeichen ----------
-\newcommand{\currency}{$(currency)$}
-\ifthenelse{\equal{\currency}{EUR}}{\let\currency\euro}{}
-\ifthenelse{\equal{\currency}{YEN}}{\let\currency\textyen}{}
-\ifthenelse{\equal{\currency}{GBP}}{\let\currency\pounds}{}
-\ifthenelse{\equal{\currency}{USD}}{\let\currency\$}{}
+\newcommand{\currency}{\euro}
+\ifthenelse{\equal{$(currency)$}{YEN}}{\let\currency\textyen}{}
+\ifthenelse{\equal{$(currency)$}{GBP}}{\let\currency\pounds}{}
+\ifthenelse{\equal{$(currency)$}{USD}}{\let\currency\$}{}
 
 % ---------- Ende Reportvariablen-Umsetzung ----------
 
@@ -190,7 +189,7 @@ wir bedanken uns für Ihre Anfrage und bieten Ihnen gemäß unserer Liefer- und
        \ifthenelse{\isempty{$(sellprice)$}}{&}{
                \numprint{$(sellprice)$}
                \ifthenelse{\equal{$(p_discount)$}{0}}{}{ -$(p_discount)$\%} &
-               \numprint{$(linetotal)$}\Wert{$(linetotal NOFORMAT)$}  
+               \numprint{$(linetotal)$}\Wert{$(linetotal NOFORMAT)$}
        }\\ %
   $(end number)$
 

diff --git a/templates/print/Standard/zahlungserinnerung.tex b/templates/print/Standard/zahlungserinnerung.tex
index f98f1a5..65d5b39 100644 (file)
--- a/templates/print/Standard/zahlungserinnerung.tex
+++ b/templates/print/Standard/zahlungserinnerung.tex
@@ -37,7 +37,7 @@
 \newcommand{\employeeemail}{$(employee_email)$}
 \newcommand{\employeecoustid}{$(employee_co_ustid)$}
 \newcommand{\employeetaxnumber}{$(employee_taxnumber)$}
-\newcommand{\employeetable}{tabelle$(employee_login)$.tex}
+\newcommand{\employeetable}{$(template_meta.tmpfile NOESCAPE)$.table.tex}
 
 % ---------- Eigene Bankverbindung falls nicht im Briefkopf gesetzt ----------
 % \newcommand{\companybank}{$(company_bank)$}
@@ -100,11 +100,10 @@
 \newcommand{\shiptofax}{$(shiptofax)$}
 
 % ---------- Währungszeichen ----------
-\newcommand{\currency}{$(currency)$}
-\ifthenelse{\equal{\currency}{EUR}}{\let\currency\euro}{}
-\ifthenelse{\equal{\currency}{YEN}}{\let\currency\textyen}{}
-\ifthenelse{\equal{\currency}{GBP}}{\let\currency\pounds}{}
-\ifthenelse{\equal{\currency}{USD}}{\let\currency\$}{}
+\newcommand{\currency}{\euro}
+\ifthenelse{\equal{$(currency)$}{YEN}}{\let\currency\textyen}{}
+\ifthenelse{\equal{$(currency)$}{GBP}}{\let\currency\pounds}{}
+\ifthenelse{\equal{$(currency)$}{USD}}{\let\currency\$}{}
 
 % ---------- Ende Reportvariablen-Umsetzung ----------
 

diff --git a/templates/webpages/ca/list.html b/templates/webpages/ca/list.html
index e779a66..1bd5ff6 100644 (file)
--- a/templates/webpages/ca/list.html
+++ b/templates/webpages/ca/list.html
@@ -5,7 +5,7 @@
 <form method=post action="[% script %]">
 
 [% L.hidden_tag('accno', accno) %]
-[% L.hidden_tag('decription', description) %]
+[% L.hidden_tag('description', description) %]
 [% L.hidden_tag('sort', 'transdate') %]
 [% L.hidden_tag('accounttype', accounttype) %]
 

diff --git a/templates/webpages/ir/form_footer.html b/templates/webpages/ir/form_footer.html
index 2047d59..ad241a1 100644 (file)
--- a/templates/webpages/ir/form_footer.html
+++ b/templates/webpages/ir/form_footer.html
@@ -150,4 +150,10 @@
       [% END %]
   [% END %]
 
+<input type="hidden" name="rowcount" value="[% rowcount %]">
+<input type="hidden" name="callback" value="[% callback %]">
+<input type="hidden" name="draft_id" value="[% draft_id %]">
+<input type="hidden" name="draft_description" value="[% draft_description %]">
+<input type="hidden" name="vendor_discount" value="[% vendor_discount %]">
+
 </form>

diff --git a/templates/webpages/is/form_footer.html b/templates/webpages/is/form_footer.html
index 3cffe05..6b3426b 100644 (file)
--- a/templates/webpages/is/form_footer.html
+++ b/templates/webpages/is/form_footer.html
@@ -164,7 +164,7 @@
 [% IF id && !is_type_credit_note %]
     <input class="submit" type="submit" name="action" value="[% 'Credit Note' | $T8 %]">
 [% END %]
-[% IF show_delete %]
+[% IF show_delete && !storno %]
     <input class="submit" type="submit" name="action" value="[% 'Delete' | $T8 %]">
     <input class="submit" type="submit" name="action" value="[% 'Post' | $T8 %]">
 [% END %]
@@ -191,4 +191,10 @@
       [% END %]
   [% END %]
 
+<input type="hidden" name="rowcount" value="[% rowcount %]">
+<input type="hidden" name="callback" value="[% callback | html %]">
+<input type="hidden" name="draft_id" value="[% draft_id %]">
+<input type="hidden" name="draft_description" value="[% draft_description %]">
+<input type="hidden" name="customer_discount" value="[% customer_discount %]">
+<input type="hidden" name="gldate" value="[% gldate %]">
 </form>