Merge branch 'fronkdev' into 'master'

RML Billing

See merge request fronk/thetool!1264
This commit is contained in:
Frank Schubert
2025-04-25 09:53:30 +00:00
7 changed files with 224 additions and 10 deletions

File diff suppressed because one or more lines are too long

View File

@@ -3,7 +3,7 @@
* @var Invoice $invoice
*/
$this->setReturnValue([
'subject' => "Ihre ".(($invoice->total < 0) ? "Gutschrift" : "Rechnung" )." ".$invoice->invoice_number,
'subject' => "Ihre Rechnung ".$invoice->invoice_number,
'from_email' => "no-reply@rmlinfrastruktur.at",
'from_email_name' => "Rechnung | RML Infrastruktur GmbH"
]);

File diff suppressed because one or more lines are too long

View File

@@ -3,7 +3,7 @@
* @var Invoice $invoice
*/
$this->setReturnValue([
'subject' => "Ihre ".(($invoice->total < 0) ? "Gutschrift" : "Rechnung" )." ".$invoice->invoice_number,
'subject' => "Ihre Rechung ".$invoice->invoice_number,
'from_email' => "no-reply@rmlinfrastruktur.at",
'from_email_name' => "Rechnung | RML Infrastruktur GmbH"
]);

View File

@@ -138,7 +138,7 @@ $this->setReturnValue(['filename' => $invoice->invoice_number . ".pdf"]);
endforeach;
?>
<tr style="font-weight: bold; background-color: #ebebeb; border-bottom: 1px solid black;border-top: 1px solid black">
<td colspan="6">Gesamt Netto:</td>
<td colspan="6">Nettobetrag</td>
<td colspan="2" style="text-align: right; padding-right: 4pt;"><?=number_format($net_total, 2, ",","."). " €"?></td>
</tr>
@@ -146,7 +146,7 @@ $this->setReturnValue(['filename' => $invoice->invoice_number . ".pdf"]);
<?php if($rate > 0): ?>
<tr style="font-size: 11px;border-bottom: 1px solid black;">
<td colspan="6">+ USt. <?=number_format($rate, 0, ",", ".")?>%:</td>
<td colspan="6">+ <?=number_format($rate, 2, ",",".")?>% USt. von <?=number_format($net_total, 2, ",",".")?></td>
<td colspan="2" style="text-align: right; padding-right: 4pt;"><?=number_format($vat_total, 2, ",","."). " €"?></td>
</tr>
<?php endif; ?>
@@ -155,7 +155,7 @@ $this->setReturnValue(['filename' => $invoice->invoice_number . ".pdf"]);
<!-- double underline border on bottom -->
<tr style="font-weight: bold; border-bottom: 3px double black; background-color: #ebebeb;">
<td colspan="6">Gesamt Brutto:</td>
<td colspan="6">Rechungsbetrag</td>
<td colspan="2" style="text-align: right; padding-right: 4pt;"><?=number_format($gross_total, 2, ",","."). " €"?></td>
</tr>
</table>