diff --git a/Layout/default/Emailtemplates/preorder-invoice/rml/invoice-email-anb.php b/Layout/default/Emailtemplates/preorder-invoice/rml/invoice-email-anb.php index 98981ecb8..62d3bc972 100644 --- a/Layout/default/Emailtemplates/preorder-invoice/rml/invoice-email-anb.php +++ b/Layout/default/Emailtemplates/preorder-invoice/rml/invoice-email-anb.php @@ -13,6 +13,10 @@ $period = "monthly"; $netowner_config = TT_PREORDER_BILLING[$invoice->netowner_id]; $netoperator_config = $netowner_config["netoperators"][$invoice->owner_id]; +if($netoperator_config["billing-period"] == "quarterly") { + $period = "quarterly"; +} + if($period == "monthly") { $fmt = new IntlDateFormatter( MFLOCALE_TIME, diff --git a/Layout/default/Emailtemplates/preorder-invoice/rml/invoice-email.php b/Layout/default/Emailtemplates/preorder-invoice/rml/invoice-email.php index ee0a6bbe8..951f247a4 100644 --- a/Layout/default/Emailtemplates/preorder-invoice/rml/invoice-email.php +++ b/Layout/default/Emailtemplates/preorder-invoice/rml/invoice-email.php @@ -5,7 +5,7 @@ $this->setReturnValue([ 'subject' => "Ihre ".(($invoice->total < 0) ? "Gutschrift" : "Rechnung" )." ".$invoice->invoice_number, 'from_email' => "no-reply@rmlinfrastruktur.at", - 'from_email_name' => "Verrechnung | RML Infrastruktur GmbH" + 'from_email_name' => "Rechnung | RML Infrastruktur GmbH" ]); ?> Sehr geehrte Damen und Herren, diff --git a/Layout/default/PreorderBillingInvoice/Index.php b/Layout/default/PreorderBillingInvoice/Index.php index 9ea26c862..c7287b3bf 100644 --- a/Layout/default/PreorderBillingInvoice/Index.php +++ b/Layout/default/PreorderBillingInvoice/Index.php @@ -175,6 +175,7 @@ $pagination_entity_name = "Rechnungen"; Brutto Versendet Erstellt + @@ -207,6 +208,9 @@ $pagination_entity_name = "Rechnungen"; creator->name?>
create)?> + + + @@ -227,6 +231,32 @@ $pagination_entity_name = "Rechnungen"; + +