diff --git a/Layout/default/PreorderBilling/Index.php b/Layout/default/PreorderBilling/Index.php index 942cb73bb..14bda6ece 100644 --- a/Layout/default/PreorderBilling/Index.php +++ b/Layout/default/PreorderBilling/Index.php @@ -117,12 +117,22 @@ $pagination_entity_name = "Billingrecords";
- "> - Rechnungsdatensätze erstellen - - "> - Rechnungen erstellen - +
+ +
+ false])): ?> +
+ +
+
diff --git a/Layout/default/PreorderBillingInvoice/Index.php b/Layout/default/PreorderBillingInvoice/Index.php index d560922e9..6d6d619ad 100644 --- a/Layout/default/PreorderBillingInvoice/Index.php +++ b/Layout/default/PreorderBillingInvoice/Index.php @@ -109,7 +109,7 @@ $pagination_entity_name = "Rechnungen"; Rechnungsdatum Kundennummer Rechnungsadresse - Text + Rechnungstext Netto Ust. Brutto @@ -137,7 +137,7 @@ $pagination_entity_name = "Rechnungen"; zip?> city?> country != "Österreich") ? "
".$invoice->country : ""?> - head_text?> + head_text))?> € total, 2, ",", ".")?> € total_gross - $invoice->total, 2, ",", ".")?> € total_gross, 2, ",", ".")?> diff --git a/Layout/default/PreorderBillingInvoice/PDF_FOOTER.html b/Layout/default/PreorderBillingInvoice/PDF_FOOTER-4807.html similarity index 74% rename from Layout/default/PreorderBillingInvoice/PDF_FOOTER.html rename to Layout/default/PreorderBillingInvoice/PDF_FOOTER-4807.html index 309127f03..2836e0b50 100644 --- a/Layout/default/PreorderBillingInvoice/PDF_FOOTER.html +++ b/Layout/default/PreorderBillingInvoice/PDF_FOOTER-4807.html @@ -28,14 +28,7 @@ } -
-
- RML Infrastruktur GmbH | Wirtschaftspark A | 8940 Liezen
- E-Mail: office@rmlinfrastruktur.at | IBAN: {{ bank_iban }}
- UID: ATU77557626 | FN: 568443x | Gerichtsstand Liezen
-
- -
Seite von
+
Seite von
diff --git a/Layout/default/PreorderBillingInvoice/PDF_HEADER.html b/Layout/default/PreorderBillingInvoice/PDF_HEADER-4807.html similarity index 84% rename from Layout/default/PreorderBillingInvoice/PDF_HEADER.html rename to Layout/default/PreorderBillingInvoice/PDF_HEADER-4807.html index 18e45f383..5dcc1a6d8 100644 --- a/Layout/default/PreorderBillingInvoice/PDF_HEADER.html +++ b/Layout/default/PreorderBillingInvoice/PDF_HEADER-4807.html @@ -11,19 +11,33 @@ border: 0; margin: 0; padding-top: 0; - font-family: "Open Sans", sans-serif, Verdana; + font-family: "Calibri", sans-serif, Verdana; font-size: 12px; } + .rml-header-text { + padding-left: 12pt; + width: 60%; + font-size: 17px; + padding-top: 52px; + line-height: 18px; + } + + .rml-header-text .header { + font-size: 20px; + } + .info-table { border-collapse: collapse; width: 100%; } .customer-details { + font-weight: bold; vertical-align: top; font-size: 14px; padding-left: 30pt; + padding-right: 30pt; width: 50%; } @@ -62,18 +76,17 @@ -
-
- RML Infrastruktur GmbH
+
+ RML Infrastruktur GmbH
Wirtschaftspark A
8940 Liezen
Österreich
- RML Logo +
diff --git a/Layout/default/PreorderBillingInvoice/PDF_MAIN.php b/Layout/default/PreorderBillingInvoice/PDF_MAIN-4807.php similarity index 58% rename from Layout/default/PreorderBillingInvoice/PDF_MAIN.php rename to Layout/default/PreorderBillingInvoice/PDF_MAIN-4807.php index a41783146..818533e51 100644 --- a/Layout/default/PreorderBillingInvoice/PDF_MAIN.php +++ b/Layout/default/PreorderBillingInvoice/PDF_MAIN-4807.php @@ -1,8 +1,13 @@ total; $gross_total = $invoice->total_gross; @@ -12,8 +17,6 @@ $invoice_date = new DateTime($invoice->invoice_date); $this->setReturnValue(['filename' => $invoice->invoice_number . ".pdf"]); -//die(json_encode($invoice->positions)); - ?> @@ -21,16 +24,20 @@ $this->setReturnValue(['filename' => $invoice->invoice_number . ".pdf"]); Rechnung - -