Merge branch 'master' of git@vc.linet-services.de:public/lx-office-erp
authorHolger Lindemann <hli@lenny.hoch.ul>
Thu, 23 Feb 2012 17:57:31 +0000 (18:57 +0100)
committerHolger Lindemann <hli@lenny.hoch.ul>
Thu, 23 Feb 2012 17:57:31 +0000 (18:57 +0100)
57 files changed:
SL/Form.pm
css/Mobile.css
css/Win2000.css
css/lx-office-erp.css
css/tabcontent.css
scripts/dbupgrade2_tool.pl
scripts/rose_auto_create_model.pl
templates/print/RB/Readme.tex
templates/print/RB/bin_list.html [new file with mode: 0644]
templates/print/RB/credit_note.tex
templates/print/RB/credit_note_DE.tex [deleted symlink]
templates/print/RB/credit_note_EN.tex [deleted symlink]
templates/print/RB/deutsch.tex
templates/print/RB/english.tex
templates/print/RB/firma/euro_account.tex
templates/print/RB/firma/ident.tex
templates/print/RB/firma/usd_account.tex
templates/print/RB/insettings.tex
templates/print/RB/invoice.html [new file with mode: 0644]
templates/print/RB/invoice.odt [new file with mode: 0644]
templates/print/RB/invoice.tex
templates/print/RB/invoice_DE.tex [deleted symlink]
templates/print/RB/invoice_EN.tex [deleted symlink]
templates/print/RB/pick_list.html [new file with mode: 0644]
templates/print/RB/purchase_delivery_order.tex
templates/print/RB/purchase_delivery_order_DE.tex [deleted symlink]
templates/print/RB/purchase_delivery_order_EN.tex [deleted symlink]
templates/print/RB/purchase_order.html [new file with mode: 0644]
templates/print/RB/purchase_order.tex
templates/print/RB/purchase_order_DE.tex [deleted symlink]
templates/print/RB/purchase_order_EN.tex [deleted symlink]
templates/print/RB/request_quotation.html [new file with mode: 0644]
templates/print/RB/request_quotation.tex
templates/print/RB/request_quotation_DE.tex [deleted symlink]
templates/print/RB/request_quotation_EN.tex [deleted symlink]
templates/print/RB/sales_delivery_order.tex
templates/print/RB/sales_delivery_order_DE.tex [deleted symlink]
templates/print/RB/sales_delivery_order_EN.tex [deleted symlink]
templates/print/RB/sales_order.html [new file with mode: 0644]
templates/print/RB/sales_order.tex
templates/print/RB/sales_order_DE.tex [deleted symlink]
templates/print/RB/sales_order_EN.tex [deleted symlink]
templates/print/RB/sales_quotation.html [new file with mode: 0644]
templates/print/RB/sales_quotation.odt [new file with mode: 0644]
templates/print/RB/sales_quotation.tex
templates/print/RB/sales_quotation_DE.tex [deleted symlink]
templates/print/RB/sales_quotation_EN.tex [deleted symlink]
templates/print/RB/statement.tex
templates/print/RB/statement_DE.tex [deleted symlink]
templates/print/RB/statement_EN.tex [deleted symlink]
templates/print/RB/ustva-2012.tex [new file with mode: 0644]
templates/print/RB/zahlungserinnerung.tex
templates/print/RB/zahlungserinnerung_DE.tex [deleted symlink]
templates/print/RB/zahlungserinnerung_EN.tex [deleted symlink]
templates/print/RB/zahlungserinnerung_invoice.tex
templates/print/RB/zahlungserinnerung_invoice_DE.tex [deleted symlink]
templates/print/RB/zahlungserinnerung_invoice_EN.tex [deleted symlink]

index 3fe20ff..6c3b297 100644 (file)
@@ -1964,7 +1964,7 @@ sub get_employee_data {
   my ($login)  = selectrow_query($self, $dbh, qq|SELECT login FROM employee WHERE id = ?|, conv_i($params{id}));
 
   if ($login) {
-    my $user = User->new($login);
+    my $user = User->new(login => $login);
     map { $self->{$params{prefix} . "_${_}"} = $user->{$_}; } qw(address businessnumber co_ustid company duns email fax name signature taxnumber tel);
 
     $self->{$params{prefix} . '_login'}   = $login;
index e59698c..1ffaef5 100644 (file)
@@ -24,26 +24,26 @@ input:focus, textarea:focus, select:focus {
 }
 
 body {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   font-size: 8pt;
   background-color: #D4D0C8;
   color: black
 }
 td {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   color: black;
   font-size: 8pt;
   font-weight: normal;
 }
 th {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   color: black;
   font-size: 8pt;
   font-weight: normal;
 }
 /* login and admin */
 .login {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
 }
 body.login {
   background: #b8d1f3;
@@ -68,7 +68,7 @@ body.admin {
 }
 body.menu {
   background-color: white;
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   font-size:8pt;
   color: black;
 }
@@ -145,11 +145,11 @@ body.menu {
 .listtotal { border-top: 1px double black; font-size: 8pt; background-color: #b8d1f3; color: black; font-weight: bolder;}
 .submit {
   font-size: 8pt;
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   color: #000000;
 }
 .checkbox, .radio {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   color: #778899;
 }
 .plus0 {    /* font color for negative numbers */
index 3b6f568..ad33ecd 100644 (file)
@@ -23,26 +23,26 @@ input:focus, textarea:focus, select:focus {
 }
 
 body {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   font-size: 10pt;
   background-color: #D4D0C8;
   color: black
 }
 td {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   color: black;
   font-size: 10pt;
   font-weight: normal;
 }
 th {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   color: black;
   font-size: 10pt;
   font-weight: normal;
 }
 /* login and admin */
 .login {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
 }
 body.login {
   background: #b8d1f3;
@@ -67,7 +67,7 @@ body.admin {
 }
 body.menu {
   background-color: white;
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   font-size:10pt;
   color: black;
 }
@@ -142,11 +142,11 @@ body.menu {
 .listsubtotal { border-top: 1px solid black; font-size: 10pt; background-color: #b8d1f3; color: black; font-weight: bolder;}
 .listtotal { border-top: 1px double black; font-size: 10pt; background-color: #b8d1f3; color: black; font-weight: bolder;}
 .submit {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   color: #000000;
 }
 .checkbox, .radio {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   color: #778899;
 }
 .plus0 {    /* font color for negative numbers */
index 8716110..5d5ca46 100644 (file)
@@ -15,7 +15,7 @@ input:focus, textarea:focus, select:focus {
 }
 
 body {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   font-size: 10pt;
   background-color: white;
   background-image: url("../image/fade.png"); background-repeat:repeat-x;
@@ -27,7 +27,7 @@ body {
 } */
 
 td {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   color: black;
   font-size: 8pt;
   font-weight: normal;
@@ -45,7 +45,7 @@ td.hover:hover {
 
 
 th {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   color: black;
   font-size: 8pt;
   font-weight: normal;
@@ -53,7 +53,7 @@ th {
 
 /* login and admin */
 .login {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
 }
 body.login {
   background: #b8d1f3;
@@ -80,7 +80,7 @@ body.admin {
 
 body.menu {
   background-image: url("../image/fade.png");background-repeat:repeat-x;
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   font-size:8pt;
   color: black;
 }
@@ -230,11 +230,11 @@ body.menu {
 
 
 .submit {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   color: #000000;
 }
 .checkbox, .radio {
-  font-family: sans-serif, Verdana, Arial, Helvetica;
+  font-family: Verdana, Arial, Helvetica, sans-serif;
   color: #778899;
 }
 
index 211af44..54c3e5e 100644 (file)
@@ -5,7 +5,7 @@ padding: 3px 0;
 margin-left: 0;\r
 margin-top: 1px;\r
 margin-bottom: 0;\r
-font: bold 12px sans-serif, Verdana;\r
+font: bold 12px Verdana, sans-serif;\r
 list-style-type: none;\r
 text-align: left; /*set to left, center, or right to align the menu as desired*/\r
 }\r
index f82cb59..253706c 100755 (executable)
@@ -436,7 +436,7 @@ if ($opt_user) {
   }
 
   $locale = new Locale($myconfig{countrycode}, "all");
-  $user   = new User($opt_user);
+  $user   = new User(login => $opt_user);
 
   map { $form->{$_} = $myconfig{$_} } keys %myconfig;
 }
index 79aef1c..14e4ba0 100755 (executable)
@@ -59,7 +59,7 @@ sub setup {
   $::locale       = Locale->new("de");
   $::form         = new Form;
   $::auth         = SL::Auth->new();
-  $::user         = User->new($login);
+  $::user         = User->new(login => $login);
   %::myconfig     = $auth->read_user(login => $login);
   $::request      = { cgi => CGI->new({}) };
   $form->{script} = 'rose_meta_data.pl';
index d0f03f2..817eaee 100644 (file)
 %   Dokument vorher mit \newcommand neu definiert.
 %
 % Sprachen:
-%   In 'insettings.tex' wird anhand des herangezogenen
-%   Vorlagen-Dateinamens die Sprache unterschieden und eine
-%   entsprechende Übersetzungsdatei geladen, die Textbausteine
-%   bzw. -Schnipsel enthält. Die Vorlagen verwenden nur diese
-%   Schnipsel. Im Moment sind die Vorlagenkürzel DE und EN in
+%   In 'insettings.tex' wird anhand des verwendeten Sprachkürzels die
+%   Sprache unterschieden und eine entsprechende Übersetzungsdatei geladen,
+%   die Textbausteine  bzw. -Schnipsel enthält. Die Vorlagen verwenden nur
+%   diese Schnipsel. Im Moment werden die Vorlagenkürzel DE und EN in
 %   Benutzung mit den entsprechenden Übersetzungsdateien 'deutsch.tex'
-%   und 'english.tex'.
-%
-%   Die eigentlichen Vorlagen sind gleich, deshalb sind die Dateien
-%   für die Sprachen (z.B. invoice_DE.tex) nur symbolische Links auf
-%   die Default-Datei ohne Sprachkürzel (z.B. invoice.tex).
-%
+%   und 'english.tex' unterschieden.
 %
 % Mandanten / Firma:
 %   Um gleiche Vorlagen für verschiedene Firmen verwenden zu können, wird je
-%   nach dem Wert der Lx-Office-Variablen <%employee_company%> ein
+%   nach dem Wert der Lx-Office-Variablen <%titlebar%> ein
 %   Firmenverzeichnis ausgewählt (siehe 'insettings.tex'), in dem Briefkopf,
 %   Identitäten und Währungs-/Kontoeinstellungen hinterlegt sind.
-%   <%employee_company%> entspricht dem Feld "Firma" bei den
-%   Benutzereinstellungen. Ist kein Firmenname eingetragen, so wird das
+%   <%titlebar%> enthält den Namen des Benutzers und der verwendeten
+%   Mandantendatenbank. Ist kein Firmenname eingetragen, so wird das
 %   generische Unterverzeichnis 'firma' verwendet.
-
+%   Das heißt, dass ein Firmenverzeichnis mit dem Namen der Mandantendatenbank
+%   angelegt werden sollte.
 %
 % Identitäten:
 %    In jedem Firmen-Unterverzeichnis soll eine Datei 'ident.tex'
diff --git a/templates/print/RB/bin_list.html b/templates/print/RB/bin_list.html
new file mode 100644 (file)
index 0000000..d57632d
--- /dev/null
@@ -0,0 +1,180 @@
+<body bgcolor=ffffff>
+
+<table width=100%>
+  <tr>
+    <td width=10>&nbsp;</td>
+    
+    <td>
+      <table width=100%>
+       <tr>
+         <td>
+           <h4>
+           <%company%>
+           <br><%address%>
+           </h4>
+         </td>
+         
+         <th><img src=http://localhost/lx-erp/lx-office-erp.png border=0 width=64 height=58></th>
+
+         <th align=right>
+           <h4>
+           Tel: <%tel%>
+           <br>Fax: <%fax%>
+           </h4>
+         </td>
+       </tr>
+       
+       <tr>
+         <th colspan=3>
+           <h4>L A G E R L I S T E</h4>
+         </th>
+       </tr>
+      </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+
+    <td>
+      <table width=100% cellspacing=0 cellpadding=0>
+       <tr bgcolor=000000>
+         <th align=left width=50%><font color=ffffff>Absender</th>
+         <th align=left width=50%><font color=ffffff>Lieferanschrift</th>
+       </tr>
+
+       <tr valign=top>
+         <td><%name%>
+         <br><%street%>
+         <br><%zipcode%>
+         <br><%city%>
+         <br><%country%>
+         <br>
+
+         <%if contact%>
+         <br>Kontakt: <%contact%>
+         <%end contact%>
+
+         <%if vendorphone%>
+         <br>Tel: <%vendorphone%>
+         <%end vendorphone%>
+
+         <%if vendorfax%>
+         <br>Fax: <%vendorfax%>
+         <%end vendorfax%>
+
+         <%if email%>
+         <br><%email%>
+         <%end email%>
+         
+         </td>
+         
+         <td><%shiptoname%>
+         <br><%shiptostreet%>
+         <br><%shiptozipcode%>
+         <br><%shiptocity%>
+         <br><%shiptocountry%>
+
+         <br>
+         <%if shiptocontact%>
+         <br>Kontakt: <%shiptocontact%>
+         <%end shiptocontact%>
+         
+         <%if shiptophone%>
+         <br>Tel: <%shiptophone%>
+         <%end shiptophone%>
+
+         <%if shiptofax%>
+         <br>Fax: <%shiptofax%>
+         <%end shiptofax%>
+         </td>
+       </tr>
+      </table>
+    </td>
+  </tr>
+
+  <tr height=5></tr>
+
+  <tr>
+    <td>&nbsp;</td>
+
+    <td>
+      <table width=100% border=1>
+       <tr>
+         <th width=17% align=left nowrap>BestellNr. #</th>
+         <th width=17% align=left nowrap>Datum</th>
+         <th width=17% align=left nowrap>Kontakt</th>
+         <%if warehouse%>
+         <th width=17% align=left nowrap>Lager</th>
+         <%end warehouse%>
+         <th width=17% align=left>Versandort</th>
+         <th width=15% align=left>Lieferung durch</th>
+       </tr>
+
+       <tr>
+         <td><%ordnumber%>&nbsp;</td>
+
+         <%if shippingdate%>
+         <td><%shippingdate%></td>
+         <%end shippingdate%>
+
+         <%if not shippingdate%>
+         <td><%orddate%></td>
+         <%end shippingdate%>
+
+         <td><%employee%>&nbsp;</td>
+
+         <%if warehouse%>
+         <td><%warehouse%></td>
+         <%end warehouse%>
+
+         <td><%shippingpoint%>&nbsp;</td>
+         <td><%shipvia%>&nbsp;</td>
+       </tr>
+      </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+
+    <td>
+      <table width=100%>
+       <tr bgcolor=000000>
+         <th align=left><font color=ffffff>Pos</th>
+         <th align=left><font color=ffffff>ArtNr.</th>
+         <th align=left><font color=ffffff>Beschreibung</th>
+         <th><font color=ffffff>Seriennummer</th>
+         <th>&nbsp;</th>
+         <th><font color=ffffff>Menge</th>
+         <th><font color=ffffff>Erh</th>
+         <th>&nbsp;</th>
+         <th><font color=ffffff>Lagerplatz</th>
+       </tr>
+
+       <%foreach number%>
+       <tr valign=top>
+         <td><%runningnumber%></td>
+         <td><%number%></td>
+         <td><%description%></td>
+         <td><%serialnumber%></td>
+         <td><%deliverydate%></td>
+         <td align=right><%qty%></td>
+         <td align=right><%ship%></td>
+         <td><%unit%></td>
+         <td><%bin%></td>
+       </tr>
+       <%end number%>
+
+      </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+
+    <td><hr noshade></td>
+  </tr>
+
+</table>
+
index fe69e9f..f64222d 100644 (file)
@@ -2,10 +2,10 @@
 
 
 % Variablen, die in settings verwendet werden
-\newcommand{\lxtmpfile} {<%tmpfile%>}
+\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
 \newcommand{\lxmedia} {<%media%>}
 \newcommand{\lxcurrency} {<%currency%>}
-\newcommand{\lxcompany} {<%employee_company%>}
+\newcommand{\lxtitlebar} {<%titlebar%>}
 
 % settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
 \input{insettings.tex}
diff --git a/templates/print/RB/credit_note_DE.tex b/templates/print/RB/credit_note_DE.tex
deleted file mode 120000 (symlink)
index 12eca38..0000000
+++ /dev/null
@@ -1 +0,0 @@
-credit_note.tex
\ No newline at end of file
diff --git a/templates/print/RB/credit_note_EN.tex b/templates/print/RB/credit_note_EN.tex
deleted file mode 120000 (symlink)
index 12eca38..0000000
+++ /dev/null
@@ -1 +0,0 @@
-credit_note.tex
\ No newline at end of file
index 03cef40..997c3a0 100644 (file)
@@ -40,7 +40,8 @@
 \newcommand{\weiteraufnaechsterseite} {weiter auf der nächsten Seite ...}
 
 \newcommand{\zahlung} {Zahlungsbedingungen:}
-
+\newcommand{\textTelefon} {Tel.:}
+\newcommand{\textFax} {Fax:}
 
 % angebot (sales_quotion)
 \newcommand{\angebot} {Angebot}
index 8a36b89..901fbd2 100644 (file)
@@ -39,7 +39,8 @@
 \newcommand{\weiteraufnaechsterseite} {to be continued on next page  ..}
 
 \newcommand{\zahlung} {Payment terms:}
-
+\newcommand{\textTelefon} {Tel.:}
+\newcommand{\textFax} {Fax:}
 
 % angebot (sales_quotion)
 \newcommand{\angebot} {Quotation}
index 6407de9..fff1ac5 100644 (file)
@@ -1,6 +1,6 @@
 \newcommand{\currency}{\euro}
-\newcommand{\kontonummer}{123456789}
-\newcommand{\bank}{Unsere Bank}
-\newcommand{\bankleitzahl}{10010010}
-\newcommand{\bic}{BICXYZ}
-\newcommand{\iban}{IBAN 12345679 1001001}
+\newcommand{\kontonummer}{4004 283 800}
+\newcommand{\bank}{GLS Bank eG}
+\newcommand{\bankleitzahl}{430 609 67}
+\newcommand{\bic}{DE87430609674004283800}
+\newcommand{\iban}{GENODEM1GLS}
index 65e798b..3c82c64 100644 (file)
@@ -1,8 +1,9 @@
-\newcommand{\telefon} {012323}
-\newcommand{\fax} {012324}
-\newcommand{\firma} {R\&B}
+\newcommand{\telefon} {++49 228 360 14 351}
+\newcommand{\fax} {}
+\newcommand{\firma} {Richardson \& Büren GbR}
 \newcommand{\strasse} {Siemensstr. 8}
 \newcommand{\ort} {53121 Bonn}
-\newcommand{\ustid} {uuu1231221}
-\newcommand{\email} {tralla@tra.la}
-\newcommand{\homepage} {http://www.tra.la}
+\newcommand{\ustid} {DE238288407}
+\newcommand{\finanzamt} {Finanzamt Bonn-Innenstadt}
+\newcommand{\email} {information@lx-office-hosting.de}
+\newcommand{\homepage} {http://www.lx-office-hosting.de}
index 67b89fb..01b8fc0 100644 (file)
@@ -1,6 +1,6 @@
 \newcommand{\currency}{\$}
-\newcommand{\kontonummer}{123456789}
-\newcommand{\bank}{Unsere Bank}
-\newcommand{\bankleitzahl}{10010010}
-\newcommand{\bic}{BICXYZ}
-\newcommand{\iban}{IBAN 12345679 1001002}
+\newcommand{\kontonummer}{4004 283 800}
+\newcommand{\bank}{GLS Bank eG}
+\newcommand{\bankleitzahl}{430 609 67}
+\newcommand{\bic}{DE87430609674004283800}
+\newcommand{\iban}{GENODEM1GLS}
index 2d9f333..cccffb9 100644 (file)
@@ -1,6 +1,6 @@
 % Sprachüberprüfung
-\IfSubStringInString{\_EN}{\lxtmpfile}{\input{english.tex}}{
-  \IfSubStringInString{\_DE}{\lxtmpfile}{\input{deutsch.tex}}{\input{deutsch.tex}}
+\ifthenelse{\equal{\lxlangcode}{EN}}{\input{english.tex}}{
+  \ifthenelse{\equal{\lxlangcode}{DE}}{\input{deutsch.tex}}{\input{deutsch.tex}}
 } % Ende EN
 
 
@@ -10,8 +10,8 @@
 % Hat man mehrere Mandanten muß man statt "Firma1" den Datenbanknamen seines
 % Mandanten eingeben.
 
-\IfSubStringInString{Firma1}{\lxcompany}{\newcommand{\identpath}{firma1}}{
-  \IfSubStringInString{Firma2}{\lxcompany}{\newcommand{\identpath}{firma2}}
+\IfSubStringInString{Firma1}{\lxtitlebar}{\newcommand{\identpath}{firma1}}{
+  \IfSubStringInString{Firma2}{\lxtitlebar}{\newcommand{\identpath}{firma2}}
     {\newcommand{\identpath}{firma}} % sonst
 } % Ende Firma1
 
 \cfoot{
   {\normalfont\fontfamily{cmss} \tiny
      \begin{tabular}{p{5cm}p{4.5cm}lr}
-        \firma    & \email              & \textKontonummer & \kontonummer \\
-        \strasse  & \homepage           & \textBank        & \bank \\
-        \ort      & \textUstid\ \ustid  & \textIban        & \iban \\
+        \firma                 & \email              & \textKontonummer & \kontonummer \\
+        \strasse               & \homepage           & \textBank        & \bank \\
+        \ort                   & \textUstid\ \ustid  & \textIban        & \iban \\
+        \textTelefon~\telefon  & \finanzamt          & \textBic         & \bic \\
+        \ifthenelse{\equal{\fax}{}}{}{\textFax~\fax} &&& \\
      \end{tabular}
   }
 }
-
diff --git a/templates/print/RB/invoice.html b/templates/print/RB/invoice.html
new file mode 100644 (file)
index 0000000..2858f4f
--- /dev/null
@@ -0,0 +1,268 @@
+
+<body bgcolor=ffffff>
+
+<table width=100%>
+<tr valign=bottom>
+  <td width=10>&nbsp;</td>
+  <td>
+  
+  <table width=100%>
+  <tr>
+    <td>
+      <h4>
+      <%company%>
+      <br><%address%>
+      </h4>
+    </td>
+
+    <td align=right>
+      <h4>
+      Telefon <%tel%>
+      <br>Telefax <%fax%>
+      </h4>
+    </td>
+  </tr>
+
+  <tr>
+    <th colspan=3>
+      <h4>R E C H N U N G</h4>
+    </th>
+  </tr>
+
+  </table>
+
+
+  <table width=100% callspacing=0 cellpadding=0>
+    
+  <tr>
+    <td align=right>
+    <table>
+    <tr>
+      <th align=right>Ausgestellt am</th><td width=10>&nbsp;</td><td><%invdate%></td>
+    </tr>
+  
+    <tr>
+      <th align=right>Bezahlbar bis</th><td width=10>&nbsp;</td><td><%duedate%></td>
+    </tr>
+
+    <tr>
+      <th align=right>Nummer</th><td>&nbsp;</td><td><%invnumber%></td></tr>
+    </tr>
+  
+    <tr>
+      <th align=right>Lieferdatum</th><td>&nbsp;</td><td><%deliverydate%></td></tr>
+    </tr>
+<!--
+    <tr>
+      <th align=right>Clerk:</th><td>&nbsp;</td><td><%username%></td>
+    </tr>
+-->
+
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+    </td>
+    </table>
+  </tr>
+
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+      <th align=left><font color=ffffff>An:</th>
+      <th align=left><font color=ffffff>Lieferaddresse:</th>
+    </tr>
+
+<!--
+     other variables which can be use:
+     contact, shiptocontact, shiptophone, shiptofax
+-->
+
+    <tr>
+      <td><%name%>
+      <br><%street%>
+      <br><%zipcode%>
+      <br><%city%>
+      <br><%country%>
+      </td>
+      
+      <td><%shiptoname%>
+      <br><%shiptostreet%>
+      <br><%shiptozipcode%>
+      <br><%shiptocity%>
+      <br><%shiptocountry%>
+      </td>
+    </tr>
+    </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+  </tr>
+  
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+<!--      <th align=right><font color=ffffff>No.</th>  -->
+      <th align=left><font color=ffffff>Nummer</th>
+      <th align=left><font color=ffffff>Beschreibung</th>
+      <th><font color=ffffff>Anz.</th>
+      <th>&nbsp;</th>
+      <th><font color=ffffff>Preis</th>
+      <th><font color=ffffff>Rab</th>
+      <th><font color=ffffff>Total</th>
+    </tr>
+
+<%foreach number%>
+    <tr valign=top>
+<!--      <td align=right><%runningnumber%>.</td>
+adjust the colspan if you include this to shift subtotal one to the right
+-->
+      <td><%number%></td>
+      <td><%description%></td>
+      <td align=right><%qty%></td>
+      <td><%unit%></td>
+      <td align=right><%sellprice%></td>
+      <td align=right><%discount%></td>
+      <td align=right><%linetotal%></td>
+    </tr>
+<%end number%>
+
+<!--
+you can also use netprice instead of sellprice if you
+don't want to show the discount
+netprice = sellprice - discount
+-->
+
+    <tr>
+      <td colspan=7><hr noshade></td>
+    </tr>
+    
+<%if taxincluded%>
+    <tr>
+      <th colspan=5 align=right>Total</th>
+      <td colspan=2 align=right><%invtotal%></td>
+    </tr>
+<%end taxincluded%>
+<%if not taxincluded%>
+    <tr>
+      <th colspan=5 align=right>Zwischensumme</th>
+      <td colspan=2 align=right><%subtotal%></td>
+    </tr>
+<%end taxincluded%>
+
+<%foreach tax%>
+    <tr>
+      <th colspan=5 align=right><%taxdescription%> auf <%taxbase%></th>
+      <td colspan=2 align=right><%tax%></td>
+    </tr>
+<%end tax%>
+
+<%if paid%>
+    <tr>
+      <th colspan=5 align=right>Bezahlt</th>
+      <td colspan=2 align=right>- <%paid%></td>
+    </tr>
+<%end paid%>
+
+    <tr>
+      <td colspan=3>&nbsp;</td>
+      <td colspan=4><hr noshade></td>
+    </tr>
+
+    <tr>
+      <td colspan=3>Bezahlbar innerhalb von <b><%terms%></b> Tagen</td>
+<%if total%>
+      <th colspan=2 align=right>Total</th>
+      <th colspan=2 align=right><%total%></th>
+<%end total%>
+    </tr>
+
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+
+    </table>
+    </td>
+  </tr>
+
+<tr>
+  <td>
+  <table width=100%>
+    <tr valign=top>
+<%if notes%>
+      <td>Bemerkungen:</td>
+      <td><%notes%></td>
+<%end notes%>
+      <td align=right>
+      Alle Preise in <b><%currency%></b>
+      <br><%shippingpoint%>
+      </td>
+    </tr>
+
+  </table>
+  </td>
+</tr>
+
+<tr><td>&nbsp;</td></tr>
+  
+<tr>
+  <td>
+  <table width=100%>
+  <tr valign=top>
+    <td><font size=-3>
+    Rechnung ist bezahlbar innerhalb von <%terms%> Tagen.
+    Nach dem <%duedate%> werden Zinsen zu einem
+    monatlichen Satz von 1.5% verrechnet.
+    Waren bleiben im Besitz von <%company%> bis die Rechnung voll bezahlt ist.
+    Rückgaben werden mit 10% Lagergebühren belastet. Beschädigte Waren
+    und Waren ohne eine Rückgabenummer werden nicht entgegengenommen.
+    </font>
+    </td>
+    <td width=150>
+    X <hr noshade>
+    </td>
+  </tr>
+  </table>
+  </td>
+</tr>
+
+<%foreach tax%>
+  <tr>
+    <th colspan=7 align=left><font size=-2><%taxdescription%> Registration <%taxnumber%></th>
+  </tr>
+<%end tax%>
+
+<%if taxincluded%>
+  <tr>
+    <th colspan=7 align=left><font size=-2>Steuern sind im Preis inbegriffen.</th>
+  </tr>
+<%end taxincluded%>
+
+<!-- business number
+  <tr>
+    <th colspan=7 align=left><font size=-2>Business Number: <%businessnumber%></font></th>
+  </tr>
+-->
+
+  <tr>
+    <th colspan=7 align=left>
+    <hr>
+    <br>Bankverbindung
+    <br>Bank
+    <br>Bankleitzahl
+    <br>Konto No.
+    </td>
+  </tr>
+
+</table>
+
+</td>
+</tr>
+</table>
+
+</body>
+</html>
+
diff --git a/templates/print/RB/invoice.odt b/templates/print/RB/invoice.odt
new file mode 100644 (file)
index 0000000..822ba90
Binary files /dev/null and b/templates/print/RB/invoice.odt differ
index bd3fa45..097f90d 100644 (file)
@@ -2,10 +2,10 @@
 
 
 % Variablen, die in settings verwendet werden
-\newcommand{\lxtmpfile} {<%tmpfile%>}
+\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
 \newcommand{\lxmedia} {<%media%>}
 \newcommand{\lxcurrency} {<%currency%>}
-\newcommand{\lxcompany} {<%employee_company%>}
+\newcommand{\lxtitlebar} {<%titlebar%>}
 
 % settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
 \input{insettings.tex}
diff --git a/templates/print/RB/invoice_DE.tex b/templates/print/RB/invoice_DE.tex
deleted file mode 120000 (symlink)
index b6a6ad8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-invoice.tex
\ No newline at end of file
diff --git a/templates/print/RB/invoice_EN.tex b/templates/print/RB/invoice_EN.tex
deleted file mode 120000 (symlink)
index b6a6ad8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-invoice.tex
\ No newline at end of file
diff --git a/templates/print/RB/pick_list.html b/templates/print/RB/pick_list.html
new file mode 100644 (file)
index 0000000..0de88eb
--- /dev/null
@@ -0,0 +1,154 @@
+
+<body bgcolor=ffffff>
+
+<table width=100%>
+  <tr>
+    <td width=10>&nbsp;</td>
+    
+    <td>
+      <table width=100%>
+       <tr>
+         <td>
+         <h4>
+         <%company%>
+         <br><%address%>
+         </h4>
+         </td>
+
+         <th><img src=http://localhost/lx-erp/lx-office-erp.png border=0 width=64 height=58></th>
+
+         <td align=right>
+         <h4>
+         Tel: <%tel%>
+         <br>Fax: <%fax%>
+         </h4>
+         </td>
+       </tr>
+
+       <tr>
+         <th colspan=3>
+           <h4>S A M M E L L I S T E</h4>
+         </th>
+       </tr>
+      </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+
+    <td>
+      <table width=100% callspacing=0 cellpadding=0>
+        <tr bgcolor=000000>
+         <th width=50% align=left><font color=ffffff>Lieferanschrift:</th>
+         <th width=50%>&nbsp;</th>
+       </tr>
+
+       <tr valign=top>
+         <td><%shiptoname%>
+         <br><%shiptostreet%>
+         <br><%shiptozipcode%>
+         <br><%shiptocity%>
+         <br><%shiptocountry%>
+         </td>
+
+         <td>
+         <%if shiptocontact%>
+         <br>Kontakt: <%shiptocontact%>
+         <%end shiptocontact%>
+
+         <%if shiptophone%>
+         <br>Tel: <%shiptophone%>
+         <%end shiptophone%>
+
+         <%if shiptofax%>
+         <br>Fax: <%shiptofax%>
+         <%end shiptofax%>
+
+         <%shiptoemail%>
+         </td>
+       </tr>
+      </table>
+    </td>
+  </tr>
+
+  <tr height=5></tr>
+
+  <tr>
+    <td>&nbsp;</td>
+
+    <td>
+      <table width=100% border=1>
+        <tr>
+         <th width=17% align=left>BestellNr. #</th>
+         <th width=17% align=left>Datum</th>
+         <th width=17% align=left nowrap>Kontakt</th>
+         <%if warehouse%>
+         <th width=17% align=left>Lager</th>
+         <%end warehouse%>
+         <th width=17% align=left>Versandort</th>
+         <th width=15% align=left>Transportmittel</th>
+       </tr>
+
+        <tr>
+         <td><%ordnumber%>&nbsp;</td>
+
+         <%if shippingdate%>
+         <td><%shippingdate%></td>
+         <%end shippingdate%>
+
+         <%if not shippingdate%>
+         <td><%orddate%></td>
+         <%end shippingdate%>
+
+         <td><%employee%>&nbsp;</td>
+
+         <%if warehouse%>
+         <td><%warehouse%>&nbsp;</td>
+         <%end warehouse%>
+
+         <td><%shippingpoint%>&nbsp;</td>
+         <td><%shipvia%>&nbsp;</td>
+       </tr>
+      </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+
+    <td>
+      <table width=100%>
+       <tr bgcolor=000000>
+         <th align=left><font color=ffffff>Pos</th>
+         <th align=left><font color=ffffff>Nummer</th>
+         <th align=left><font color=ffffff>Beschreibung</th>
+         <th><font color=ffffff>Menge</th>
+         <th><font color=ffffff>geliefert</th>
+         <th>&nbsp;</th>
+         <th><font color=ffffff>Lagerplatz</th>
+       </tr>
+
+        <%foreach number%>
+       <tr valign=top>
+         <td><%runningnumber%>
+         <td><%number%></td>
+         <td><%description%></td>
+         <td align=right><%qty%></td>
+         <td align=right>[&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;]</td>
+         <td><%unit%></td>
+         <td align=right><%bin%></td>
+       </tr>
+       <%end number%>
+      </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+
+    <td><hr noshade></td>
+  </tr>
+
+</table>
+
index a231b1f..5f4a674 100644 (file)
@@ -2,10 +2,10 @@
 
 
 % Variablen, die in settings verwendet werden
-\newcommand{\lxtmpfile} {<%tmpfile%>}
+\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
 \newcommand{\lxmedia} {<%media%>}
 \newcommand{\lxcurrency} {<%currency%>}
-\newcommand{\lxcompany} {<%employee_company%>}
+\newcommand{\lxtitlebar} {<%titlebar%>}
 
 % settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
 \input{insettings.tex}
diff --git a/templates/print/RB/purchase_delivery_order_DE.tex b/templates/print/RB/purchase_delivery_order_DE.tex
deleted file mode 120000 (symlink)
index 7d185e6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-purchase_delivery_order.tex
\ No newline at end of file
diff --git a/templates/print/RB/purchase_delivery_order_EN.tex b/templates/print/RB/purchase_delivery_order_EN.tex
deleted file mode 120000 (symlink)
index 7d185e6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-purchase_delivery_order.tex
\ No newline at end of file
diff --git a/templates/print/RB/purchase_order.html b/templates/print/RB/purchase_order.html
new file mode 100644 (file)
index 0000000..e83c67a
--- /dev/null
@@ -0,0 +1,188 @@
+
+<body bgcolor=ffffff>
+
+<table width=100%>
+<tr valign=bottom>
+  <td width=10>&nbsp;</td>
+  <td>
+  
+  <table width=100%>
+  <tr>
+    <td>
+      <h4>
+      <%company%>
+      <br><%address%>
+      </h4>
+    </td>
+
+    <td align=right>
+      <h4>
+      Telefon <%tel%>
+      <br>Telefax <%fax%>
+      </h4>
+    </td>
+  </tr>
+
+  <tr>
+    <th colspan=3>
+      <h4>B E S T E L L U N G</h4>
+    </th>
+  </tr>
+
+  </table>
+
+
+  <table width=100% callspacing=0 cellpadding=0>
+    
+  <tr>
+    <td align=right>
+    <table>
+    <tr>
+      <th align=right>Bestellungsdatum</th><td width=10>&nbsp;</td><td><%orddate%></td>
+    </tr>
+  
+    <tr>
+      <th align=right>Lieferbar bis</th><td width=10>&nbsp;</td><td><%reqdate%></td>
+    </tr>
+
+    <tr>
+      <th align=right>Bestellnummer</th><td>&nbsp;</td><td><%ordnumber%></td></tr>
+    </tr>
+  
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+    </td>
+    </table>
+  </tr>
+
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+      <th align=left><font color=ffffff>An:</th>
+    </tr>
+
+    <tr>
+      <td><%name%>
+      <br><%street%>
+      <br><%zipcode%>
+      <br><%city%>
+      <br><%country%>
+      </td>
+    </tr>
+    </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+  </tr>
+  
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+<!--      <th align=right><font color=ffffff>No.</th>  -->
+      <th align=left><font color=ffffff>Nummer</th>
+      <th align=left><font color=ffffff>Artikel</th>
+      <th><font color=ffffff>Anz</th>
+      <th>&nbsp;</th>
+      <th><font color=ffffff>Preis</th>
+      <th><font color=ffffff>Total</th>
+    </tr>
+
+<%foreach number%>
+    <tr valign=top>
+<!--      <td align=right><%runningnumber%>.</td>
+adjust the colspan if you include this to shift subtotal one to the right
+-->
+      <td><%number%></td>
+      <td><%description%></td>
+      <td align=right><%qty%></td>
+      <td><%unit%></td>
+      <td align=right><%sellprice%></td>
+      <td align=right><%linetotal%></td>
+    </tr>
+<%end number%>
+
+    <tr>
+      <td colspan=6><hr noshade></td>
+    </tr>
+    
+    <tr>
+      <th colspan=4 align=right>Zwischensumme</th>
+      <td colspan=2 align=right><%subtotal%></td>
+    </tr>
+
+<%foreach tax%>
+    <tr>
+      <th colspan=4 align=right><%taxdescription%> @ <%taxrate%> %</th>
+      <td colspan=2 align=right><%tax%></td>
+    </tr>
+<%end tax%>
+
+    <tr>
+      <td colspan=2>&nbsp;</td>
+      <td colspan=4><hr noshade></td>
+    </tr>
+
+    <tr>
+      <td colspan=2>Netto <b><%terms%></b> Tage</td>
+      <th colspan=2 align=right>Total</th>
+      <th colspan=2 align=right><%total%></th>
+    </tr>
+
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+
+    </table>
+    </td>
+  </tr>
+
+<tr>
+  <td>
+  <table width=100%>
+    <tr valign=top>
+<%if notes%>
+      <td>Bemerkungen</td>
+      <td><%notes%></td>
+<%end notes%>
+      <td align=right>
+      Alle Preise in <b><%currency%></b>
+      <br><%shippingpoint%>
+      </td>
+    </tr>
+
+  </table>
+  </td>
+</tr>
+
+<tr><td>&nbsp;</td></tr>
+  
+<tr>
+  <td>
+  <table width=100%>
+  <tr valign=top>
+    <td><font size=-3>
+    &nbsp;
+    </font>
+    </td>
+    <td width=150>
+    X <hr noshade>
+    </td>
+  </tr>
+  </table>
+  </td>
+</tr>
+
+</table>
+
+</td>
+</tr>
+</table>
+
+</body>
+</html>
+
index d1bc3fd..e1a737a 100644 (file)
@@ -2,10 +2,10 @@
 
 
 % Variablen, die in settings verwendet werden
-\newcommand{\lxtmpfile} {<%tmpfile%>}
+\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
 \newcommand{\lxmedia} {<%media%>}
 \newcommand{\lxcurrency} {<%currency%>}
-\newcommand{\lxcompany} {<%employee_company%>}
+\newcommand{\lxtitlebar} {<%titlebar%>}
 
 % settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
 \input{insettings.tex}
@@ -20,6 +20,8 @@
 \ourfont
 
 \begin{minipage}{8cm}
+  \vspace*{1.0cm}
+
   <%name%>
 
   <%street%>
diff --git a/templates/print/RB/purchase_order_DE.tex b/templates/print/RB/purchase_order_DE.tex
deleted file mode 120000 (symlink)
index a9fdc31..0000000
+++ /dev/null
@@ -1 +0,0 @@
-purchase_order.tex
\ No newline at end of file
diff --git a/templates/print/RB/purchase_order_EN.tex b/templates/print/RB/purchase_order_EN.tex
deleted file mode 120000 (symlink)
index a9fdc31..0000000
+++ /dev/null
@@ -1 +0,0 @@
-purchase_order.tex
\ No newline at end of file
diff --git a/templates/print/RB/request_quotation.html b/templates/print/RB/request_quotation.html
new file mode 100644 (file)
index 0000000..6ff0036
--- /dev/null
@@ -0,0 +1,194 @@
+
+<body bgcolor=ffffff>
+
+<table width=100%>
+<tr valign=bottom>
+  <td width=10>&nbsp;</td>
+  <td>
+  
+  <table width=100%>
+  <tr>
+    <td>
+      <h4>
+      <%company%>
+      <br><%address%>
+      </h4>
+    </td>
+
+    <td><img src=http://localhost/lx-erp/lx-office-erp.png border=0 width=64 height=58>
+    </td>
+
+    <td align=right>
+      <h4>
+      Tel: <%tel%>
+      <br>Fax: <%fax%>
+      </h4>
+    </td>
+  </tr>
+
+  <tr>
+    <th colspan=3>
+      <h4>A N F R A G E</h4>
+    </th>
+  </tr>
+
+  </table>
+
+
+  <table width=100% callspacing=0 cellpadding=0>
+
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+      <th align=left width=50%><font color=ffffff>Rechnungsanschrift:</th>
+      <th align=left width=50%><font color=ffffff>Lieferanschrift:</th>
+    </tr>
+
+    <tr valign=top>
+      <td><%name%>
+      <br><%street%>
+      <br><%zipcode%>
+      <br><%city%>
+      <br><%country%>
+<br>
+<%if contact%>
+<br>Kontakt: <%contact%>
+<%end contact%>
+<%if vendorphone%>
+<br>Tel: <%vendorphone%>
+<%end vendorphone%>
+<%if vendorfax%>
+<br>Fax: <%vendorfax%>
+<%end vendorfax%>
+      </td>
+
+      <td><%shiptoname%>
+      <br><%shiptostreet%>
+      <br><%shiptozipcode%>
+      <br><%shiptocity%>
+      <br><%shiptocountry%>
+<br>
+<%if shiptocontact%>
+<br>Kontakt: <%shiptocontact%>
+<%end shiptocontact%>
+<%if shiptophone%>
+<br>Tel: <%shiptophone%>
+<%end shiptophone%>
+<%if shiptofax%>
+<br>Fax: <%shiptofax%>
+<%end shiptofax%>
+    </tr>
+    </table>
+    </td>
+  </tr>
+
+  <tr><td>&nbsp;</td></tr>
+
+  <tr>
+    <td colspan=2>
+    <table width=100% border=1>
+    <tr>
+      <th width=17% align=left>AnfrageNr. #</th>
+      <th width=17% align=left>Datum</th>
+      <th width=17% align=left>Erforderlich am</th>
+      <th width=17% align=left>Kontakt</th>
+      <th width=17% align=left>Lagerplatz</th>
+      <th width=15% align=left>Versand mit:</th>
+    </tr>
+
+    <tr>
+      <td><%quonumber%></td>
+      <td><%quodate%></td>
+      <td><%reqdate%></td>
+      <td><%employee%></td>
+      <td><%shippingpoint%></td>
+      <td><%shipvia%></td>
+    </tr>
+    </table>
+    </td>
+  </tr>
+
+  <tr height="10"></tr>
+
+  <tr>
+    <td>Bitte teilen Sie uns Preise und Lieferzeit für folgende Artikel mit:</td>
+  </tr>
+
+  <tr height="10"></tr>
+
+  <tr>
+    <td>
+    <table width=100%>
+    <tr>
+<!--      <th align=right>No.</th>  -->
+      <th align=left>ArtNr.</th>
+      <th align=left>Beschreibung</th>
+      <th>Menge</th>
+      <th>&nbsp;</th>
+      <th>Lieferung</th>
+      <th>Stückpreis</th>
+      <th>Gesamtpreis</th>
+    </tr>
+
+<%foreach number%>
+    <tr valign=top>
+<!--      <td align=right><%runningnumber%>.</td>
+other per line item variables available <%reqdate%>
+adjust the colspan if you include this to shift subtotal one to the right
+-->
+      <td><%number%></td>
+      <td><%description%></td>
+      <td align=right><%qty%></td>
+      <td><%unit%></td>
+
+    </tr>
+<%end number%>
+
+    <tr>
+      <td colspan=7><hr noshade></td>
+    </tr>
+
+    </table>
+    </td>
+  </tr>
+
+<tr>
+  <td>
+  <table width=100%>
+<%if notes%>
+    <tr valign=top>
+      <td>Bemerkungen</td>
+      <td><%notes%></td>
+    </tr>
+<%end notes%>
+
+  </table>
+  </td>
+</tr>
+
+<tr><td>&nbsp;</td></tr>
+  
+<tr>
+  <td>
+  <table width=100%>
+  <tr valign=top>
+    <td width=70%>&nbsp;</td>
+
+    <td width=30%>
+    X <hr noshade>
+    </td>
+  </tr>
+  </table>
+  </td>
+</tr>
+
+</table>
+
+</td>
+</tr>
+</table>
+
+</body>
+</html>
+
index 4cce5b5..ceb554b 100644 (file)
@@ -2,10 +2,10 @@
 
 
 % Variablen, die in settings verwendet werden
-\newcommand{\lxtmpfile} {<%tmpfile%>}
+\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
 \newcommand{\lxmedia} {<%media%>}
 \newcommand{\lxcurrency} {<%currency%>}
-\newcommand{\lxcompany} {<%employee_company%>}
+\newcommand{\lxtitlebar} {<%titlebar%>}
 
 % settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
 \input{insettings.tex}
diff --git a/templates/print/RB/request_quotation_DE.tex b/templates/print/RB/request_quotation_DE.tex
deleted file mode 120000 (symlink)
index 6b0aa64..0000000
+++ /dev/null
@@ -1 +0,0 @@
-request_quotation.tex
\ No newline at end of file
diff --git a/templates/print/RB/request_quotation_EN.tex b/templates/print/RB/request_quotation_EN.tex
deleted file mode 120000 (symlink)
index 6b0aa64..0000000
+++ /dev/null
@@ -1 +0,0 @@
-request_quotation.tex
\ No newline at end of file
index 2db1b3d..690fd13 100644 (file)
@@ -2,10 +2,10 @@
 
 
 % Variablen, die in settings verwendet werden
-\newcommand{\lxtmpfile} {<%tmpfile%>}
+\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
 \newcommand{\lxmedia} {<%media%>}
 \newcommand{\lxcurrency} {<%currency%>}
-\newcommand{\lxcompany} {<%employee_company%>}
+\newcommand{\lxtitlebar} {<%titlebar%>}
 
 % settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
 \input{insettings.tex}
diff --git a/templates/print/RB/sales_delivery_order_DE.tex b/templates/print/RB/sales_delivery_order_DE.tex
deleted file mode 120000 (symlink)
index e01d614..0000000
+++ /dev/null
@@ -1 +0,0 @@
-sales_delivery_order.tex
\ No newline at end of file
diff --git a/templates/print/RB/sales_delivery_order_EN.tex b/templates/print/RB/sales_delivery_order_EN.tex
deleted file mode 120000 (symlink)
index e01d614..0000000
+++ /dev/null
@@ -1 +0,0 @@
-sales_delivery_order.tex
\ No newline at end of file
diff --git a/templates/print/RB/sales_order.html b/templates/print/RB/sales_order.html
new file mode 100644 (file)
index 0000000..4cbe20a
--- /dev/null
@@ -0,0 +1,213 @@
+
+<body bgcolor=ffffff>
+
+<table width=100%>
+<tr valign=bottom>
+  <td width=10>&nbsp;</td>
+  <td>
+  
+  <table width=100%>
+  <tr>
+    <td>
+      <h4>
+      <%company%>
+      <br><%address%>
+      </h4>
+    </td>
+
+    <td align=right>
+      <h4>
+      Telefon <%tel%>
+      <br>Telefax <%fax%>
+      </h4>
+    </td>
+  </tr>
+
+  <tr>
+    <th colspan=3>
+      <h4>B E S T E L L U N G</h4>
+    </th>
+  </tr>
+
+  </table>
+
+
+  <table width=100% callspacing=0 cellpadding=0>
+    
+  <tr>
+    <td align=right>
+    <table>
+    <tr>
+      <th align=right>Bestelldatum</th><td width=10>&nbsp;</td><td><%orddate%></td>
+    </tr>
+  
+    <tr>
+      <th align=right>Lieferbar bei</th><td width=10>&nbsp;</td><td><%reqdate%></td>
+    </tr>
+
+    <tr>
+      <th align=right>Bestellnummer</th><td>&nbsp;</td><td><%ordnumber%></td></tr>
+    </tr>
+  
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+    </td>
+    </table>
+  </tr>
+
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+      <th align=left><font color=ffffff>Verrechnet An:</th>
+      <th align=left><font color=ffffff>Lieferaddresse:</th>
+    </tr>
+
+    <tr>
+      <td><%name%>
+      <br><%street%>
+      <br><%zipcode%>
+      <br><%city%>
+      <br><%country%>
+      </td>
+
+      <td><%shiptoname%>
+      <br><%shiptostreet%>
+      <br><%shiptozipcode%>
+      <br><%shiptocity%>
+      <br><%shiptocountry%>
+      </td>
+    </tr>
+    </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+  </tr>
+  
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+<!--      <th align=right><font color=ffffff>No.</th>  -->
+      <th align=left><font color=ffffff>Nummer</th>
+      <th align=left><font color=ffffff>Artikel</th>
+      <th><font color=ffffff>Anz</th>
+      <th>&nbsp;</th>
+      <th><font color=ffffff>Preis</th>
+      <th><font color=ffffff>Rab</th>
+      <th><font color=ffffff>Total</th>
+    </tr>
+
+<%foreach number%>
+    <tr valign=top>
+<!--      <td align=right><%runningnumber%>.</td>
+adjust the colspan if you include this to shift subtotal one to the right
+-->
+      <td><%number%></td>
+      <td><%description%></td>
+      <td align=right><%qty%></td>
+      <td><%unit%></td>
+      <td align=right><%sellprice%></td>
+      <td align=right><%discount%></td>
+      <td align=right><%linetotal%></td>
+    </tr>
+<%end number%>
+
+    <tr>
+      <td colspan=7><hr noshade></td>
+    </tr>
+    
+<%if taxincluded%>
+    <tr>
+      <th colspan=5 align=right>Total</th>
+      <td colspan=2 align=right><%ordtotal%></td>
+    </tr>
+<%end taxincluded%>
+
+<%if not taxincluded%>
+    <tr>
+      <th colspan=5 align=right>Zwischensumme</th>
+      <td colspan=2 align=right><%subtotal%></td>
+    </tr>
+<%end taxincluded%>
+
+<%foreach tax%>
+    <tr>
+      <th colspan=5 align=right><%taxdescription%> auf <%taxbase%> @ <%taxrate%> %</th>
+      <td colspan=2 align=right><%tax%></td>
+    </tr>
+<%end tax%>
+
+    <tr>
+      <td colspan=2>&nbsp;</td>
+      <td colspan=5><hr noshade></td>
+    </tr>
+
+    <tr>
+      <td colspan=3>Netto <b><%terms%></b> Tage</td>
+      <th colspan=2 align=right>Total</th>
+      <th colspan=2 align=right><%ordtotal%></th>
+    </tr>
+<%if taxincluded%>
+    <tr>
+      <td colspan=3>Steuern sind im Preis inbegriffen</td>
+    </tr>
+<%end taxincluded%>
+
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+
+    </table>
+    </td>
+  </tr>
+
+<tr>
+  <td>
+  <table width=100%>
+    <tr valign=top>
+<%if notes%>
+      <td>Bemerkungen</td>
+      <td><%notes%></td>
+<%end notes%>
+      <td align=right>
+      Alle Preise in <b><%currency%></b>
+      <br><%shippingpoint%>
+      </td>
+    </tr>
+
+  </table>
+  </td>
+</tr>
+
+<tr><td>&nbsp;</td></tr>
+  
+<tr>
+  <td>
+  <table width=100%>
+  <tr valign=top>
+    <td><font size=-3>
+    Spezialprodukte werden nicht zurückgenommen. Für alle anderen Waren
+    wird eine 10% Stornogebühr verrechnet.
+    </font>
+    </td>
+    <td width=150>
+    X <hr noshade>
+    </td>
+  </tr>
+  </table>
+  </td>
+</tr>
+
+</table>
+
+</td>
+</tr>
+</table>
+
+</body>
+</html>
+
index 97f4b11..0e15a1a 100644 (file)
@@ -2,10 +2,10 @@
 
 
 % Variablen, die in settings verwendet werden
-\newcommand{\lxtmpfile} {<%tmpfile%>}
+\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
 \newcommand{\lxmedia} {<%media%>}
 \newcommand{\lxcurrency} {<%currency%>}
-\newcommand{\lxcompany} {<%employee_company%>}
+\newcommand{\lxtitlebar} {<%titlebar%>}
 
 % settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
 \input{insettings.tex}
diff --git a/templates/print/RB/sales_order_DE.tex b/templates/print/RB/sales_order_DE.tex
deleted file mode 120000 (symlink)
index df07c2a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-sales_order.tex
\ No newline at end of file
diff --git a/templates/print/RB/sales_order_EN.tex b/templates/print/RB/sales_order_EN.tex
deleted file mode 120000 (symlink)
index df07c2a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-sales_order.tex
\ No newline at end of file
diff --git a/templates/print/RB/sales_quotation.html b/templates/print/RB/sales_quotation.html
new file mode 100644 (file)
index 0000000..1380631
--- /dev/null
@@ -0,0 +1,221 @@
+
+<body bgcolor=ffffff>
+
+<table width=100%>
+<tr valign=bottom>
+  <td width=10>&nbsp;</td>
+  <td>
+  
+  <table width=100%>
+  <tr valign=top>
+    <td>
+      <h4>
+      <%company%>
+      <br><%address%>
+      </h4>
+    </td>
+
+    <th><img src=http://localhost/lx-erp/lx-office-erp.png border=0 width=64 height=58></th>
+
+    <td align=right>
+      <h4>
+      Tel: <%tel%>
+      <br>Fax: <%fax%>
+      </h4>
+    </td>
+  </tr>
+
+<tr><td colspan=3>&nbsp;</td></tr>
+
+  <tr>
+    <th colspan=3>
+      <h4>A N G E B O T</h4>
+    </th>
+  </tr>
+
+  </table>
+
+  <table width=100% callspacing=0 cellpadding=0>
+
+  <tr>
+    <td>
+    <table width=100%>
+
+    <tr valign=top>
+      <td><%name%>
+      <br><%street%>
+      <br><%zipcode%>
+      <br><%city%>
+      <br><%country%>
+<br>
+<%if contact%>
+<br>Kontakt: <%contact%>
+<%end contact%>
+
+<%if customerphone%>
+<br>Tel: <%customerphone%>
+<%end customerphone%>
+
+<%if customerfax%>
+<br>Fax: <%customerfax%>
+<%end customerfax%>
+
+<%if email%>
+<br><%email%>
+<%end email%>
+      </td>
+
+    </tr>
+    </table>
+    </td>
+  </tr>
+
+  <tr><td>&nbsp;</td></tr>
+
+  <tr>
+    <td colspan=2>
+      <table width=100% border=1>
+        <tr>
+         <th width=17% align=left nowrap>Nummer</th>
+         <th width=17% align=left>Datum</th>
+         <th width=17% align=left>Gültig bis</th>
+         <th width=17% align=left nowrap>Kontakt</th>
+         <th width=17% align=left nowrap>Lagerplatz</th>
+         <th width=15% align=left nowrap>Lieferung mit</th>
+       </tr>
+
+       <tr>
+         <td><%quonumber%></td>
+         <td><%quodate%></td>
+         <td><%reqdate%></td>
+         <td><%employee%></td>
+         <td><%shippingpoint%></td>
+         <td><%shipvia%></td>
+       </tr>
+      </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+  </tr>
+
+  <tr>
+    <td>
+    <table width=100%>
+    <tr bgcolor=000000>
+      <th align=right><font color=ffffff>Nr.</th>
+      <th align=left><font color=ffffff>Artikelnummer</th>
+      <th align=left><font color=ffffff>Beschreibung</th>
+      <th><font color=ffffff>Menge</th>
+      <th>&nbsp;</th>
+      <th><font color=ffffff>Preis</th>
+      <th><font color=ffffff>Rabatt</th>
+      <th><font color=ffffff>Gesamtpreis</th>
+    </tr>
+
+<%foreach number%>
+    <tr valign=top>
+    <td align=right><%runningnumber%></td>
+
+      <td><%number%></td>
+      <td><%description%></td>
+      <td align=right><%qty%></td>
+      <td><%unit%></td>
+      <td align=right><%sellprice%></td>
+      <td align=right><%discount%></td>
+      <td align=right><%linetotal%></td>
+    </tr>
+<%end number%>
+
+    <tr>
+      <td colspan=8><hr noshade></td>
+    </tr>
+
+    <tr>
+<%if taxincluded%>
+      <th colspan=6 align=right>Gesamtbetrag netto</th>
+      <td colspan=2 align=right><%invtotal%></td>
+<%end taxincluded%>
+
+<%if not taxincluded%>
+      <th colspan=6 align=right>Zwischensumme</th>
+      <td colspan=2 align=right><%subtotal%></td>
+<%end taxincluded%>
+    </tr>
+
+<%foreach tax%>
+    <tr>
+      <th colspan=6 align=right><%taxdescription%> von <%taxbase%> @ <%taxrate%> %</th>
+      <td colspan=2 align=right><%tax%></td>
+    </tr>
+<%end tax%>
+
+    <tr>
+      <td colspan=4>&nbsp;</td>
+      <td colspan=4><hr noshade></td>
+    </tr>
+
+    <tr>
+      <td colspan=4>&nbsp;
+<%if terms%>
+      Zahlungsziel <b><%terms%></b> Tage
+<%end terms%>
+      </td>
+      <th colspan=2 align=right>Gesamtbetrag brutto</th>
+      <th colspan=2 align=right><%quototal%></th>
+    </tr>
+
+    <tr>
+      <td>&nbsp;</td>
+    </tr>
+
+    </table>
+    </td>
+  </tr>
+
+<tr>
+  <td>
+  <table width=100%>
+    <tr valign=top>
+<%if notes%>
+      <td>Bemerkungen</td>
+      <td><%notes%></td>
+<%end notes%>
+      <td align=right>
+      Alle Preise in <b><%currency%></b> Euro
+      </td>
+    </tr>
+
+  </table>
+  </td>
+</tr>
+
+<tr><td>&nbsp;</td></tr>
+
+<tr>
+  <td>
+  <table width=100%>
+  <tr valign=top>
+    <td width=60%><font size=-3>
+    Spezialanfertigungen können nicht zurückgenommen werden.
+    </font>
+    </td>
+    <td width=40%>
+    X <hr noshade>
+    </td>
+  </tr>
+  </table>
+  </td>
+</tr>
+
+</table>
+
+</td>
+</tr>
+</table>
+
+</body>
+</html>
+
+
diff --git a/templates/print/RB/sales_quotation.odt b/templates/print/RB/sales_quotation.odt
new file mode 100644 (file)
index 0000000..d42a867
Binary files /dev/null and b/templates/print/RB/sales_quotation.odt differ
index 7481b7f..277eb07 100644 (file)
@@ -2,10 +2,10 @@
 
 
 % Variablen, die in settings verwendet werden
-\newcommand{\lxtmpfile} {<%tmpfile%>}
+\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
 \newcommand{\lxmedia} {<%media%>}
 \newcommand{\lxcurrency} {<%currency%>}
-\newcommand{\lxcompany} {<%employee_company%>}
+\newcommand{\lxtitlebar} {<%titlebar%>}
 
 % settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
 \input{insettings.tex}
diff --git a/templates/print/RB/sales_quotation_DE.tex b/templates/print/RB/sales_quotation_DE.tex
deleted file mode 120000 (symlink)
index 75262f7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-sales_quotation.tex
\ No newline at end of file
diff --git a/templates/print/RB/sales_quotation_EN.tex b/templates/print/RB/sales_quotation_EN.tex
deleted file mode 120000 (symlink)
index 75262f7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-sales_quotation.tex
\ No newline at end of file
index b545a67..4b3610e 100644 (file)
@@ -2,10 +2,10 @@
 
 
 % Variablen, die in settings verwendet werden
-\newcommand{\lxtmpfile} {<%tmpfile%>}
+\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
 \newcommand{\lxmedia} {<%media%>}
 \newcommand{\lxcurrency} {<%currency%>}
-\newcommand{\lxcompany} {<%employee_company%>}
+\newcommand{\lxtitlebar} {<%titlebar%>}
 
 % settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
 \input{insettings.tex}
diff --git a/templates/print/RB/statement_DE.tex b/templates/print/RB/statement_DE.tex
deleted file mode 120000 (symlink)
index 67ba506..0000000
+++ /dev/null
@@ -1 +0,0 @@
-statement.tex
\ No newline at end of file
diff --git a/templates/print/RB/statement_EN.tex b/templates/print/RB/statement_EN.tex
deleted file mode 120000 (symlink)
index 67ba506..0000000
+++ /dev/null
@@ -1 +0,0 @@
-statement.tex
\ No newline at end of file
diff --git a/templates/print/RB/ustva-2012.tex b/templates/print/RB/ustva-2012.tex
new file mode 100644 (file)
index 0000000..3a35db9
--- /dev/null
@@ -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-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}
index 6be829b..3460007 100644 (file)
@@ -2,10 +2,10 @@
 
 
 % Variablen, die in settings verwendet werden
-\newcommand{\lxtmpfile} {<%tmpfile%>}
+\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
 \newcommand{\lxmedia} {<%media%>}
 \newcommand{\lxcurrency} {<%currency%>}
-\newcommand{\lxcompany} {<%employee_company%>}
+\newcommand{\lxtitlebar} {<%titlebar%>}
 
 % settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
 \input{insettings.tex}
diff --git a/templates/print/RB/zahlungserinnerung_DE.tex b/templates/print/RB/zahlungserinnerung_DE.tex
deleted file mode 120000 (symlink)
index 92fc494..0000000
+++ /dev/null
@@ -1 +0,0 @@
-zahlungserinnerung.tex
\ No newline at end of file
diff --git a/templates/print/RB/zahlungserinnerung_EN.tex b/templates/print/RB/zahlungserinnerung_EN.tex
deleted file mode 120000 (symlink)
index 92fc494..0000000
+++ /dev/null
@@ -1 +0,0 @@
-zahlungserinnerung.tex
\ No newline at end of file
index 017d69b..7470888 100644 (file)
@@ -2,10 +2,10 @@
 
 
 % Variablen, die in settings verwendet werden
-\newcommand{\lxtmpfile} {<%tmpfile%>}
+\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
 \newcommand{\lxmedia} {<%media%>}
 \newcommand{\lxcurrency} {<%currency%>}
-\newcommand{\lxcompany} {<%employee_company%>}
+\newcommand{\lxtitlebar} {<%titlebar%>}
 
 % settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
 \input{insettings.tex}
diff --git a/templates/print/RB/zahlungserinnerung_invoice_DE.tex b/templates/print/RB/zahlungserinnerung_invoice_DE.tex
deleted file mode 120000 (symlink)
index 40b9d06..0000000
+++ /dev/null
@@ -1 +0,0 @@
-zahlungserinnerung_invoice.tex
\ No newline at end of file
diff --git a/templates/print/RB/zahlungserinnerung_invoice_EN.tex b/templates/print/RB/zahlungserinnerung_invoice_EN.tex
deleted file mode 120000 (symlink)
index 40b9d06..0000000
+++ /dev/null
@@ -1 +0,0 @@
-zahlungserinnerung_invoice.tex
\ No newline at end of file