From: Holger Lindemann Date: Thu, 23 Feb 2012 17:57:31 +0000 (+0100) Subject: Merge branch 'master' of git@vc.linet-services.de:public/lx-office-erp X-Git-Tag: release-3.0.0beta1~344^2^2~8 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/e03763d69fe89fffd6a3bde4fa144e7fa27fbd98?hp=1e19326147024df6e4af529fdfd1abdb53150d35 Merge branch 'master' of git@vc.linet-services.de:public/lx-office-erp --- diff --git a/SL/Form.pm b/SL/Form.pm index 3fe20ffb9..6c3b297db 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -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; diff --git a/css/Mobile.css b/css/Mobile.css index e59698cde..1ffaef555 100644 --- a/css/Mobile.css +++ b/css/Mobile.css @@ -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 */ diff --git a/css/Win2000.css b/css/Win2000.css index 3b6f56850..ad33ecdd1 100644 --- a/css/Win2000.css +++ b/css/Win2000.css @@ -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 */ diff --git a/css/lx-office-erp.css b/css/lx-office-erp.css index 8716110c8..5d5ca4607 100644 --- a/css/lx-office-erp.css +++ b/css/lx-office-erp.css @@ -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; } diff --git a/css/tabcontent.css b/css/tabcontent.css index 211af44eb..54c3e5e18 100644 --- a/css/tabcontent.css +++ b/css/tabcontent.css @@ -5,7 +5,7 @@ padding: 3px 0; margin-left: 0; margin-top: 1px; margin-bottom: 0; -font: bold 12px sans-serif, Verdana; +font: bold 12px Verdana, sans-serif; list-style-type: none; text-align: left; /*set to left, center, or right to align the menu as desired*/ } diff --git a/scripts/dbupgrade2_tool.pl b/scripts/dbupgrade2_tool.pl index f82cb595b..253706c93 100755 --- a/scripts/dbupgrade2_tool.pl +++ b/scripts/dbupgrade2_tool.pl @@ -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; } diff --git a/scripts/rose_auto_create_model.pl b/scripts/rose_auto_create_model.pl index 79aef1c76..14e4ba0fc 100755 --- a/scripts/rose_auto_create_model.pl +++ b/scripts/rose_auto_create_model.pl @@ -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'; diff --git a/templates/print/RB/Readme.tex b/templates/print/RB/Readme.tex index d0f03f2c8..817eaee1f 100644 --- a/templates/print/RB/Readme.tex +++ b/templates/print/RB/Readme.tex @@ -24,28 +24,23 @@ % 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 index 000000000..d57632dc7 --- /dev/null +++ b/templates/print/RB/bin_list.html @@ -0,0 +1,180 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  + + + + + + + + + + + +
+

+ <%company%> +
<%address%> +

+ 		+

+ Tel: <%tel%> +
Fax: <%fax%> +

+ +
+

L A G E R L I S T E

+
+
  + + + + + + + + + + + +
AbsenderLieferanschrift
<%name%> +
<%street%> +
<%zipcode%> +
<%city%> +
<%country%> +
+ + <%if contact%> +
Kontakt: <%contact%> + <%end contact%> + + <%if vendorphone%> +
Tel: <%vendorphone%> + <%end vendorphone%> + + <%if vendorfax%> +
Fax: <%vendorfax%> + <%end vendorfax%> + + <%if email%> +
<%email%> + <%end email%> + + 		<%shiptoname%> +
<%shiptostreet%> +
<%shiptozipcode%> +
<%shiptocity%> +
<%shiptocountry%> + +
+ <%if shiptocontact%> +
Kontakt: <%shiptocontact%> + <%end shiptocontact%> + + <%if shiptophone%> +
Tel: <%shiptophone%> + <%end shiptophone%> + + <%if shiptofax%> +
Fax: <%shiptofax%> + <%end shiptofax%> +
+
  + + + + + + <%if warehouse%> + + <%end warehouse%> + + + + + + + + <%if shippingdate%> + + <%end shippingdate%> + + <%if not shippingdate%> + + <%end shippingdate%> + + + + <%if warehouse%> + + <%end warehouse%> + + + + +
BestellNr. #DatumKontaktLagerVersandortLieferung durch
<%ordnumber%> <%shippingdate%><%orddate%><%employee%> <%warehouse%><%shippingpoint%> <%shipvia%> 
+
  + + + + + + + + + + + + + + <%foreach number%> + + + + + + + + + + + + <%end number%> + +
PosArtNr.BeschreibungSeriennummer MengeErh Lagerplatz
<%runningnumber%><%number%><%description%><%serialnumber%><%deliverydate%><%qty%><%ship%><%unit%><%bin%>
+
 
+ diff --git a/templates/print/RB/credit_note.tex b/templates/print/RB/credit_note.tex index fe69e9f3c..f64222dc7 100644 --- a/templates/print/RB/credit_note.tex +++ b/templates/print/RB/credit_note.tex @@ -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 index 12eca385f..000000000 --- a/templates/print/RB/credit_note_DE.tex +++ /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 index 12eca385f..000000000 --- a/templates/print/RB/credit_note_EN.tex +++ /dev/null @@ -1 +0,0 @@ -credit_note.tex \ No newline at end of file diff --git a/templates/print/RB/deutsch.tex b/templates/print/RB/deutsch.tex index 03cef406f..997c3a01d 100644 --- a/templates/print/RB/deutsch.tex +++ b/templates/print/RB/deutsch.tex @@ -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} diff --git a/templates/print/RB/english.tex b/templates/print/RB/english.tex index 8a36b8999..901fbd2a2 100644 --- a/templates/print/RB/english.tex +++ b/templates/print/RB/english.tex @@ -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} diff --git a/templates/print/RB/firma/euro_account.tex b/templates/print/RB/firma/euro_account.tex index 6407de999..fff1ac59a 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}{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} diff --git a/templates/print/RB/firma/ident.tex b/templates/print/RB/firma/ident.tex index 65e798b2f..3c82c64bb 100644 --- a/templates/print/RB/firma/ident.tex +++ b/templates/print/RB/firma/ident.tex @@ -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} diff --git a/templates/print/RB/firma/usd_account.tex b/templates/print/RB/firma/usd_account.tex index 67b89fb41..01b8fc09f 100644 --- a/templates/print/RB/firma/usd_account.tex +++ b/templates/print/RB/firma/usd_account.tex @@ -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} diff --git a/templates/print/RB/insettings.tex b/templates/print/RB/insettings.tex index 2d9f333fe..cccffb9e2 100644 --- a/templates/print/RB/insettings.tex +++ b/templates/print/RB/insettings.tex @@ -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 @@ -90,10 +90,11 @@ \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 index 000000000..2858f4f08 --- /dev/null +++ b/templates/print/RB/invoice.html @@ -0,0 +1,268 @@ + + + + + + + + +
  + + + + + + + + + + + + +
+

+ <%company%> +
<%address%> +

+ 		+

+ Telefon <%tel%> +
Telefax <%fax%> +

+
+

R E C H N U N G

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<%foreach tax%> + + + +<%end tax%> + +<%if taxincluded%> + + + +<%end taxincluded%> + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + +
Ausgestellt am <%invdate%>
Bezahlbar bis <%duedate%>
Nummer <%invnumber%>
Lieferdatum <%deliverydate%>
 
+
+ + + + + + + + + + + + + +
An:Lieferaddresse:
<%name%> +
<%street%> +
<%zipcode%> +
<%city%> +
<%country%> + 		<%shiptoname%> +
<%shiptostreet%> +
<%shiptozipcode%> +
<%shiptocity%> +
<%shiptocountry%> +
+
 
+ + + + + + + + + + + + +<%foreach number%> + + + + + + + + + + +<%end number%> + + + + + + + +<%if taxincluded%> + + + + +<%end taxincluded%> +<%if not taxincluded%> + + + + +<%end taxincluded%> + +<%foreach tax%> + + + + +<%end tax%> + +<%if paid%> + + + + +<%end paid%> + + + + + + + + +<%if total%> + + +<%end total%> + + + + + + +
NummerBeschreibungAnz. PreisRabTotal
<%number%><%description%><%qty%><%unit%><%sellprice%><%discount%><%linetotal%>
Total<%invtotal%>
Zwischensumme<%subtotal%>
<%taxdescription%> auf <%taxbase%><%tax%>
Bezahlt- <%paid%>
 
Bezahlbar innerhalb von <%terms%> TagenTotal<%total%>
 
+
+ + +<%if notes%> + + +<%end notes%> + + + +
Bemerkungen:<%notes%> + Alle Preise in <%currency%> +
<%shippingpoint%> +
+
 
+ + + + + +
+ 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. + + + X
+
+
<%taxdescription%> Registration <%taxnumber%>
Steuern sind im Preis inbegriffen.
+
+
Bankverbindung +
Bank +
Bankleitzahl +
Konto No. + +
+ +
+ + + + diff --git a/templates/print/RB/invoice.odt b/templates/print/RB/invoice.odt new file mode 100644 index 000000000..822ba9062 Binary files /dev/null and b/templates/print/RB/invoice.odt differ diff --git a/templates/print/RB/invoice.tex b/templates/print/RB/invoice.tex index bd3fa4581..097f90da5 100644 --- a/templates/print/RB/invoice.tex +++ b/templates/print/RB/invoice.tex @@ -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 index b6a6ad821..000000000 --- a/templates/print/RB/invoice_DE.tex +++ /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 index b6a6ad821..000000000 --- a/templates/print/RB/invoice_EN.tex +++ /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 index 000000000..0de88eb5b --- /dev/null +++ b/templates/print/RB/pick_list.html @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  + + + + + + + + + + + + +
+

+ <%company%> +
<%address%> +

+ 		+

+ Tel: <%tel%> +
Fax: <%fax%> +

+
+

S A M M E L L I S T E

+
+
  + + + + + + + + + + + +
Lieferanschrift: 
<%shiptoname%> +
<%shiptostreet%> +
<%shiptozipcode%> +
<%shiptocity%> +
<%shiptocountry%> + 		+ <%if shiptocontact%> +
Kontakt: <%shiptocontact%> + <%end shiptocontact%> + + <%if shiptophone%> +
Tel: <%shiptophone%> + <%end shiptophone%> + + <%if shiptofax%> +
Fax: <%shiptofax%> + <%end shiptofax%> + + <%shiptoemail%> +
+
  + + + + + + <%if warehouse%> + + <%end warehouse%> + + + + + + + + <%if shippingdate%> + + <%end shippingdate%> + + <%if not shippingdate%> + + <%end shippingdate%> + + + + <%if warehouse%> + + <%end warehouse%> + + + + +
BestellNr. #DatumKontaktLagerVersandortTransportmittel
<%ordnumber%> <%shippingdate%><%orddate%><%employee%> <%warehouse%> <%shippingpoint%> <%shipvia%> 
+
  + + + + + + + + + + + + <%foreach number%> + + + + + + + + + <%end number%> +
PosNummerBeschreibungMengegeliefert Lagerplatz
<%runningnumber%> + <%number%><%description%><%qty%>[      ]<%unit%><%bin%>
+
 
+ diff --git a/templates/print/RB/purchase_delivery_order.tex b/templates/print/RB/purchase_delivery_order.tex index a231b1fee..5f4a674e4 100644 --- a/templates/print/RB/purchase_delivery_order.tex +++ b/templates/print/RB/purchase_delivery_order.tex @@ -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 index 7d185e626..000000000 --- a/templates/print/RB/purchase_delivery_order_DE.tex +++ /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 index 7d185e626..000000000 --- a/templates/print/RB/purchase_delivery_order_EN.tex +++ /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 index 000000000..e83c67a2b --- /dev/null +++ b/templates/print/RB/purchase_order.html @@ -0,0 +1,188 @@ + + + + + + + + +
  + + + + + + + + + + + + +
+

+ <%company%> +
<%address%> +

+ 		+

+ Telefon <%tel%> +
Telefax <%fax%> +

+
+

B E S T E L L U N G

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + +
Bestellungsdatum <%orddate%>
Lieferbar bis <%reqdate%>
Bestellnummer <%ordnumber%>
 
+
+ + + + + + + + +
An:
<%name%> +
<%street%> +
<%zipcode%> +
<%city%> +
<%country%> +
+
 
+ + + + + + + + + + + +<%foreach number%> + + + + + + + + + +<%end number%> + + + + + + + + + + +<%foreach tax%> + + + + +<%end tax%> + + + + + + + + + + + + + + + + +
NummerArtikelAnz PreisTotal
<%number%><%description%><%qty%><%unit%><%sellprice%><%linetotal%>
Zwischensumme<%subtotal%>
<%taxdescription%> @ <%taxrate%> %<%tax%>
 
Netto <%terms%> TageTotal<%total%>
 
+
+ + +<%if notes%> + + +<%end notes%> + + + +
Bemerkungen<%notes%> + Alle Preise in <%currency%> +
<%shippingpoint%> +
+
 
+ + + + + +
+   + + + X
+
+
+ +
+ + + + diff --git a/templates/print/RB/purchase_order.tex b/templates/print/RB/purchase_order.tex index d1bc3fdf4..e1a737ab2 100644 --- a/templates/print/RB/purchase_order.tex +++ b/templates/print/RB/purchase_order.tex @@ -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 index a9fdc31d8..000000000 --- a/templates/print/RB/purchase_order_DE.tex +++ /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 index a9fdc31d8..000000000 --- a/templates/print/RB/purchase_order_EN.tex +++ /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 index 000000000..6ff003634 --- /dev/null +++ b/templates/print/RB/request_quotation.html @@ -0,0 +1,194 @@ + + + + + + + + +
  + + + + + + + + + + + + + + +
+

+ <%company%> +
<%address%> +

+ 		+ +

+ Tel: <%tel%> +
Fax: <%fax%> +

+
+

A N F R A G E

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + +
Rechnungsanschrift:Lieferanschrift:
<%name%> +
<%street%> +
<%zipcode%> +
<%city%> +
<%country%> +
+<%if contact%> +
Kontakt: <%contact%> +<%end contact%> +<%if vendorphone%> +
Tel: <%vendorphone%> +<%end vendorphone%> +<%if vendorfax%> +
Fax: <%vendorfax%> +<%end vendorfax%> + 		<%shiptoname%> +
<%shiptostreet%> +
<%shiptozipcode%> +
<%shiptocity%> +
<%shiptocountry%> +
+<%if shiptocontact%> +
Kontakt: <%shiptocontact%> +<%end shiptocontact%> +<%if shiptophone%> +
Tel: <%shiptophone%> +<%end shiptophone%> +<%if shiptofax%> +
Fax: <%shiptofax%> +<%end shiptofax%> +
+
 
+ + + + + + + + + + + + + + + + + + +
AnfrageNr. #DatumErforderlich amKontaktLagerplatzVersand mit:
<%quonumber%><%quodate%><%reqdate%><%employee%><%shippingpoint%><%shipvia%>
+
Bitte teilen Sie uns Preise und Lieferzeit für folgende Artikel mit:
+ + + + + + + + + + + + +<%foreach number%> + + + + + + + + +<%end number%> + + + + + +
ArtNr.BeschreibungMenge LieferungStückpreisGesamtpreis
<%number%><%description%><%qty%><%unit%>
+
+ +<%if notes%> + + + + +<%end notes%> + +
Bemerkungen<%notes%>
+
 
+ + + + + + +
  + X
+
+
+ +
+ + + + diff --git a/templates/print/RB/request_quotation.tex b/templates/print/RB/request_quotation.tex index 4cce5b571..ceb554b5c 100644 --- a/templates/print/RB/request_quotation.tex +++ b/templates/print/RB/request_quotation.tex @@ -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 index 6b0aa6419..000000000 --- a/templates/print/RB/request_quotation_DE.tex +++ /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 index 6b0aa6419..000000000 --- a/templates/print/RB/request_quotation_EN.tex +++ /dev/null @@ -1 +0,0 @@ -request_quotation.tex \ No newline at end of file diff --git a/templates/print/RB/sales_delivery_order.tex b/templates/print/RB/sales_delivery_order.tex index 2db1b3d03..690fd137f 100644 --- a/templates/print/RB/sales_delivery_order.tex +++ b/templates/print/RB/sales_delivery_order.tex @@ -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 index e01d6148b..000000000 --- a/templates/print/RB/sales_delivery_order_DE.tex +++ /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 index e01d6148b..000000000 --- a/templates/print/RB/sales_delivery_order_EN.tex +++ /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 index 000000000..4cbe20afb --- /dev/null +++ b/templates/print/RB/sales_order.html @@ -0,0 +1,213 @@ + + + + + + + + +
  + + + + + + + + + + + + +
+

+ <%company%> +
<%address%> +

+ 		+

+ Telefon <%tel%> +
Telefax <%fax%> +

+
+

B E S T E L L U N G

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + +
Bestelldatum <%orddate%>
Lieferbar bei <%reqdate%>
Bestellnummer <%ordnumber%>
 
+
+ + + + + + + + + + + +
Verrechnet An:Lieferaddresse:
<%name%> +
<%street%> +
<%zipcode%> +
<%city%> +
<%country%> + 		<%shiptoname%> +
<%shiptostreet%> +
<%shiptozipcode%> +
<%shiptocity%> +
<%shiptocountry%> +
+
 
+ + + + + + + + + + + + +<%foreach number%> + + + + + + + + + + +<%end number%> + + + + + +<%if taxincluded%> + + + + +<%end taxincluded%> + +<%if not taxincluded%> + + + + +<%end taxincluded%> + +<%foreach tax%> + + + + +<%end tax%> + + + + + + + + + + + +<%if taxincluded%> + + + +<%end taxincluded%> + + + + + +
NummerArtikelAnz PreisRabTotal
<%number%><%description%><%qty%><%unit%><%sellprice%><%discount%><%linetotal%>
Total<%ordtotal%>
Zwischensumme<%subtotal%>
<%taxdescription%> auf <%taxbase%> @ <%taxrate%> %<%tax%>
 
Netto <%terms%> TageTotal<%ordtotal%>
Steuern sind im Preis inbegriffen
 
+
+ + +<%if notes%> + + +<%end notes%> + + + +
Bemerkungen<%notes%> + Alle Preise in <%currency%> +
<%shippingpoint%> +
+
 
+ + + + + +
+ Spezialprodukte werden nicht zurückgenommen. Für alle anderen Waren + wird eine 10% Stornogebühr verrechnet. + + + X
+
+
+ +
+ + + + diff --git a/templates/print/RB/sales_order.tex b/templates/print/RB/sales_order.tex index 97f4b11dd..0e15a1aae 100644 --- a/templates/print/RB/sales_order.tex +++ b/templates/print/RB/sales_order.tex @@ -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 index df07c2a72..000000000 --- a/templates/print/RB/sales_order_DE.tex +++ /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 index df07c2a72..000000000 --- a/templates/print/RB/sales_order_EN.tex +++ /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 index 000000000..138063154 --- /dev/null +++ b/templates/print/RB/sales_quotation.html @@ -0,0 +1,221 @@ + + + + + + + + +
  + + + + + + + + + + + + + + + + +
+

+ <%company%> +
<%address%> +

+ 		+

+ Tel: <%tel%> +
Fax: <%fax%> +

+
 
+

A N G E B O T

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + +
<%name%> +
<%street%> +
<%zipcode%> +
<%city%> +
<%country%> +
+<%if contact%> +
Kontakt: <%contact%> +<%end contact%> + +<%if customerphone%> +
Tel: <%customerphone%> +<%end customerphone%> + +<%if customerfax%> +
Fax: <%customerfax%> +<%end customerfax%> + +<%if email%> +
<%email%> +<%end email%> +
+
 
+ + + + + + + + + + + + + + + + + + +
NummerDatumGültig bisKontaktLagerplatzLieferung mit
<%quonumber%><%quodate%><%reqdate%><%employee%><%shippingpoint%><%shipvia%>
+
 
+ + + + + + + + + + + + +<%foreach number%> + + + + + + + + + + + +<%end number%> + + + + + + +<%if taxincluded%> + + +<%end taxincluded%> + +<%if not taxincluded%> + + +<%end taxincluded%> + + +<%foreach tax%> + + + + +<%end tax%> + + + + + + + + + + + + + + + + +
Nr.ArtikelnummerBeschreibungMenge PreisRabattGesamtpreis
<%runningnumber%><%number%><%description%><%qty%><%unit%><%sellprice%><%discount%><%linetotal%>
Gesamtbetrag netto<%invtotal%>Zwischensumme<%subtotal%>
<%taxdescription%> von <%taxbase%> @ <%taxrate%> %<%tax%>
 
  +<%if terms%> + Zahlungsziel <%terms%> Tage +<%end terms%> + Gesamtbetrag brutto<%quototal%>
 
+
+ + +<%if notes%> + + +<%end notes%> + + + +
Bemerkungen<%notes%> + Alle Preise in <%currency%> Euro +
+
 
+ + + + + +
+ Spezialanfertigungen können nicht zurückgenommen werden. + + + X
+
+
+ +
+ + + + + diff --git a/templates/print/RB/sales_quotation.odt b/templates/print/RB/sales_quotation.odt new file mode 100644 index 000000000..d42a867ec Binary files /dev/null and b/templates/print/RB/sales_quotation.odt differ diff --git a/templates/print/RB/sales_quotation.tex b/templates/print/RB/sales_quotation.tex index 7481b7f2c..277eb0761 100644 --- a/templates/print/RB/sales_quotation.tex +++ b/templates/print/RB/sales_quotation.tex @@ -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 index 75262f7fe..000000000 --- a/templates/print/RB/sales_quotation_DE.tex +++ /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 index 75262f7fe..000000000 --- a/templates/print/RB/sales_quotation_EN.tex +++ /dev/null @@ -1 +0,0 @@ -sales_quotation.tex \ No newline at end of file diff --git a/templates/print/RB/statement.tex b/templates/print/RB/statement.tex index b545a67ca..4b3610e7e 100644 --- a/templates/print/RB/statement.tex +++ b/templates/print/RB/statement.tex @@ -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 index 67ba506b1..000000000 --- a/templates/print/RB/statement_DE.tex +++ /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 index 67ba506b1..000000000 --- a/templates/print/RB/statement_EN.tex +++ /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 index 000000000..3a35db9d6 --- /dev/null +++ b/templates/print/RB/ustva-2012.tex @@ -0,0 +1,153 @@ +% German USTVA template for taxreports +% Contributed by Marcus Habermehl +% Based on template by Jacky und Stefan Tenne (German-ustva-2008.tex) +% +% +\documentclass[twoside]{scrartcl} +\usepackage{a4,german} +\usepackage[frame]{xy} +\usepackage[utf8]{inputenc} +\usepackage[german]{babel} +\usepackage{graphicx} +\usepackage{tabularx} +\usepackage{times, german} +\usepackage{german} +\setlength{\voffset}{-0.7cm} %hier wird die Höhenverschiebung +\setlength{\hoffset}{-1cm} %und hier die Verschiebung seitwärts +\setlength{\topmargin}{0cm} +\setlength{\headheight}{0cm} +\setlength{\headsep}{0cm} +\setlength{\topskip}{0pt} +\setlength{\oddsidemargin}{0cm} +\setlength{\evensidemargin}{0cm} +\setlength{\textwidth}{20.9cm} +\setlength{\textheight}{29.6cm} +\setlength{\footskip}{-0cm} +\setlength{\parindent}{1mm} + +\begin{document} + +\fontfamily{cmss}\fontshape{n}\large\selectfont +\pagestyle{myheadings} +\markboth{\protect\scalebox{1.045}[1.045]{\protect\includegraphics[viewport = 54 783 700 790,page=2]{ustva-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} diff --git a/templates/print/RB/zahlungserinnerung.tex b/templates/print/RB/zahlungserinnerung.tex index 6be829b69..346000720 100644 --- a/templates/print/RB/zahlungserinnerung.tex +++ b/templates/print/RB/zahlungserinnerung.tex @@ -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 index 92fc4949c..000000000 --- a/templates/print/RB/zahlungserinnerung_DE.tex +++ /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 index 92fc4949c..000000000 --- a/templates/print/RB/zahlungserinnerung_EN.tex +++ /dev/null @@ -1 +0,0 @@ -zahlungserinnerung.tex \ No newline at end of file diff --git a/templates/print/RB/zahlungserinnerung_invoice.tex b/templates/print/RB/zahlungserinnerung_invoice.tex index 017d69bba..74708888b 100644 --- a/templates/print/RB/zahlungserinnerung_invoice.tex +++ b/templates/print/RB/zahlungserinnerung_invoice.tex @@ -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 index 40b9d065f..000000000 --- a/templates/print/RB/zahlungserinnerung_invoice_DE.tex +++ /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 index 40b9d065f..000000000 --- a/templates/print/RB/zahlungserinnerung_invoice_EN.tex +++ /dev/null @@ -1 +0,0 @@ -zahlungserinnerung_invoice.tex \ No newline at end of file