From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Fri, 9 Nov 2012 15:43:57 +0000 (+0100)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0beta1~10^2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/9e48b29b3c99d6e7675fbb17a3612c6899405595?hp=00302856e8e4f1505a2315d24c9779b082d180db

Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
---

diff --git a/sql/Pg-upgrade2/chart_type_skonto.sql b/sql/Pg-upgrade2/chart_type_skonto.sql
new file mode 100644
index 000000000..2a090e1b8
--- /dev/null
+++ b/sql/Pg-upgrade2/chart_type_skonto.sql
@@ -0,0 +1,15 @@
+-- @tag: chart_type_skonto
+-- @description: SKR: Gewährte Skonti sind Erlöskonten, erhaltene Skonti sind Aufwandskonten
+-- @depends: release_2_7_0
+-- @encoding: utf-8
+
+UPDATE chart SET category = 'I' WHERE accno = '8731' AND EXISTS (SELECT * FROM defaults WHERE coa = 'Germany-DATEV-SKR03EU');
+UPDATE chart SET category = 'I' WHERE accno = '8735' AND EXISTS (SELECT * FROM defaults WHERE coa = 'Germany-DATEV-SKR03EU');
+UPDATE chart SET category = 'E' WHERE accno = '3731' AND EXISTS (SELECT * FROM defaults WHERE coa = 'Germany-DATEV-SKR03EU');
+UPDATE chart SET category = 'E' WHERE accno = '3735' AND EXISTS (SELECT * FROM defaults WHERE coa = 'Germany-DATEV-SKR03EU');
+
+UPDATE chart SET category = 'I' WHERE accno = '4731' AND EXISTS (SELECT * FROM defaults WHERE coa = 'Germany-DATEV-SKR04EU');
+UPDATE chart SET category = 'I' WHERE accno = '4735' AND EXISTS (SELECT * FROM defaults WHERE coa = 'Germany-DATEV-SKR04EU');
+UPDATE chart SET category = 'I' WHERE accno = '4736' AND EXISTS (SELECT * FROM defaults WHERE coa = 'Germany-DATEV-SKR04EU');
+UPDATE chart SET category = 'E' WHERE accno = '5731' AND EXISTS (SELECT * FROM defaults WHERE coa = 'Germany-DATEV-SKR04EU');
+UPDATE chart SET category = 'E' WHERE accno = '5735' AND EXISTS (SELECT * FROM defaults WHERE coa = 'Germany-DATEV-SKR04EU');
diff --git a/templates/print/f-tex/default.tex b/templates/print/f-tex/default.tex
index abca29a40..fb0f39b9e 100644
--- a/templates/print/f-tex/default.tex
+++ b/templates/print/f-tex/default.tex
@@ -357,7 +357,7 @@
 %======Die eigentliche-Tabelle========================================
 
 % temporaere Datei mit Tabelle anlegen
-\begin{filecontents}{<%template_meta.tmpfile%>.table.tex}
+\begin{filecontents}{<%template_meta.tmpfile NOESCAPE%>.table.tex}
 \mainfont
 \resetlaufsumme
 
@@ -489,7 +489,7 @@
   }
 \end{filecontents}  % Ende der Hilfsdatei.
 
-\LTXtable{\textwidth}{<%template_meta.tmpfile%>.table.tex}
+\LTXtable{\textwidth}{<%template_meta.tmpfile NOESCAPE%>.table.tex}
 
 \rule{\textwidth}{0pt}   % Ein (unsichtbarer) Strich quer ueber die Seite
 \vspace{ 5mm}