From: Jan Büren <jan@kivitendo-premium.de>
Date: Mon, 20 Jan 2014 14:02:26 +0000 (+0100)
Subject: Druckvorlagen RB aktualisiert
X-Git-Tag: release-3.1.0beta1~21^2^2~12
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=e0c529a490b9b69559862166e63f0807c82f1b49;p=kivitendo-erp.git

Druckvorlagen RB aktualisiert
---

diff --git a/templates/print/RB/firma/briefkopf.png b/templates/print/RB/firma/briefkopf.png
index 998899581..a98907cd5 100644
Binary files a/templates/print/RB/firma/briefkopf.png and b/templates/print/RB/firma/briefkopf.png differ
diff --git a/templates/print/RB/firma/euro_account.tex b/templates/print/RB/firma/euro_account.tex
index fff1ac59a..fd3e6d143 100644
--- a/templates/print/RB/firma/euro_account.tex
+++ b/templates/print/RB/firma/euro_account.tex
@@ -1,6 +1,6 @@
 \newcommand{\currency}{\euro}
-\newcommand{\kontonummer}{4004 283 800}
+\newcommand{\kontonummer}{4071953800}
 \newcommand{\bank}{GLS Bank eG}
 \newcommand{\bankleitzahl}{430 609 67}
-\newcommand{\bic}{DE87430609674004283800}
-\newcommand{\iban}{GENODEM1GLS}
+\newcommand{\iban}{DE50430609674071953800}
+\newcommand{\bic}{GENODEM1GLS}
diff --git a/templates/print/RB/firma/ident.tex b/templates/print/RB/firma/ident.tex
index 3c82c64bb..0ee9060f7 100644
--- a/templates/print/RB/firma/ident.tex
+++ b/templates/print/RB/firma/ident.tex
@@ -1,9 +1,9 @@
-\newcommand{\telefon} {++49 228 360 14 351}
+\newcommand{\telefon} {++49 228 92 98 2012}
 \newcommand{\fax} {}
-\newcommand{\firma} {Richardson \& Büren GbR}
-\newcommand{\strasse} {Siemensstr. 8}
-\newcommand{\ort} {53121 Bonn}
-\newcommand{\ustid} {DE238288407}
+\newcommand{\firma} {Richardson \& Büren GmbH}
+\newcommand{\strasse} {Römerstr. 45 - 47}
+\newcommand{\ort} {53111 Bonn}
+\newcommand{\ustid} {DE292363254}
 \newcommand{\finanzamt} {Finanzamt Bonn-Innenstadt}
-\newcommand{\email} {information@lx-office-hosting.de}
-\newcommand{\homepage} {http://www.lx-office-hosting.de}
+\newcommand{\email} {information@kivitendo-premium.de}
+\newcommand{\homepage} {http://www.kivitendo-premium.de}
diff --git a/templates/print/RB/insettings.tex b/templates/print/RB/insettings.tex
index cccffb9e2..4eaad875a 100644
--- a/templates/print/RB/insettings.tex
+++ b/templates/print/RB/insettings.tex
@@ -48,7 +48,7 @@
         a4paper,      % DINA4
         %% left=19mm,    % Linker Rand
         %% width=142mm,  % Textbreite
-        top=49mm,     % Abstand Textanfang von oben
+        top=46mm,     % Abstand Textanfang von oben
         head=5mm,     % Höhe des Kopfes
         headsep=12mm, % Abstand Kopf zu Textanfang
         bottom=25mm,  % Abstand von unten
@@ -94,7 +94,7 @@
         \strasse               & \homepage           & \textBank        & \bank \\
         \ort                   & \textUstid\ \ustid  & \textIban        & \iban \\
         \textTelefon~\telefon  & \finanzamt          & \textBic         & \bic \\
-        \ifthenelse{\equal{\fax}{}}{}{\textFax~\fax} &&& \\
+        \ifthenelse{\equal{\fax}{}}{}{\textFax~\fax} & &\textBankleitzahl	& \bankleitzahl \\
      \end{tabular}
   }
 }
diff --git a/templates/print/RB/invoice.tex b/templates/print/RB/invoice.tex
index 9959c452f..170ae3a0a 100644
--- a/templates/print/RB/invoice.tex
+++ b/templates/print/RB/invoice.tex
@@ -24,6 +24,12 @@
 
   <%name%>
 
+  <%department_1%>
+
+  <%department_2%>
+
+  <%cp_givenname%> <%cp_name%>
+
   <%street%>
 
   ~
@@ -67,8 +73,12 @@
 \ifthenelse{\equal{<%cp_name%>}{}}{\anrede}{
   \ifthenelse{\equal{<%cp_gender%>}{f}}
     {\anredefrau}{\anredeherr} <%cp_title%> <%cp_name%>,}\\
+%\rechnungsformel\\
+
+<%if notes%>
+        <%notes%>
+<%end if%>
 
-\rechnungsformel\\
 
 \vspace{0.5cm}
 
@@ -83,16 +93,16 @@
 %
 \setlength\LTleft\parindent     % Tabelle beginnt am linken Textrand
 \setlength\LTright{0pt}         % Tabelle endet am rechten Textrand
-\begin{longtable}{@{}rrp{7cm}@{\extracolsep{\fill}}rrr@{}}
+\begin{longtable}{@{}rrp{9cm}@{\extracolsep{\fill}}rrr@{}}
 % Tabellenkopf
 \hline
-\textbf{\position} & \textbf{\artikelnummer} & \textbf{\bezeichnung} & \textbf{\menge} & \textbf{\einzelpreis} & \textbf{\gesamtpreis} \\
+\textbf{\position} & & \textbf{\bezeichnung} & \textbf{\menge} & \textbf{\einzelpreis} & \textbf{\gesamtpreis} \\
 \hline\\
 \endhead
 
 % Tabellenkopf erste Seite
 \hline
-\textbf{\position} & \textbf{\artikelnummer} & \textbf{\bezeichnung} & \textbf{\menge} & \textbf{\einzelpreis} & \textbf{\gesamtpreis} \\
+\textbf{\position} & & \textbf{\bezeichnung} & \textbf{\menge} & \textbf{\einzelpreis} & \textbf{\gesamtpreis} \\
 \hline\\[-0.5em]
 \endfirsthead
 
@@ -114,7 +124,7 @@
 % eigentliche Tabelle
 <%foreach number%>
           <%runningnumber%> &
-          <%number%> &
+          &
           \textbf{<%description%>} &
           \raggedleft <%qty%> <%unit%> &
           <%sellprice%> \currency &
@@ -135,12 +145,6 @@
 
 \vspace{0.2cm}
 
-<%if notes%>
-        \vspace{5mm}
-        <%notes%>
-        \vspace{5mm}
-<%end if%>
-
 \ifthenelse{\equal{<%deliverydate%>}{}}{\leistungsdatumGleichRechnungsdatum}{\lieferungErfolgtAm ~<%deliverydate%>.} \\
 
 <%if payment_terms%>