Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Tweak for 1st time billing

Browse Source
This commit is contained in:
Frank Schubert
2024-07-07 21:28:20 +02:00
parent e49d47ed7d
commit dbd332018b
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Layout/default/Invoice/PDF_MAIN.php
View File

@@ -90,10 +90,10 @@ $this->setReturnValue(['filename' => $invoice->invoice_number . ".pdf"]);
<table style="border-collapse: collapse; width: 100%;" id="invoiceTable">
<tr style="font-weight: bold; border-bottom: 1px solid black;" class="uneven">
<th style="text-align: center">Dienstleistung</th>
<th style="text-align: center">Leitung / Produkt</th>
<th style="text-align: center">Zeitraum</th>
<th style="text-align: right">Preis</th>
<th style="text-align: center;">Menge</th>
<th style="text-align: center">Menge</th>
<th style="text-align: right">Netto €</th>
<th style="text-align: right">Ust. %</th>
<th style="text-align: right; padding-right: 4pt">Brutto €</th>

5
application/Billing/BillingController.php
View File

@@ -275,6 +275,11 @@ class BillingController extends mfBaseController {
continue;
}
if($contract->billing_period == 1 && $start_date->format("Y") < 2024 || ($start_date->format("Y") == 2024 && $start_date->format("m") < 7)) {
// XXX only for 1st Billing after IVT Import
$this->log->debug(__METHOD__.": Ignoring Contract ".$contract->id." with start_date ".$start_date->format("Y-m-d")." because is before this month");
}
// if contract has cancel date this month
// use cancel date as end_date
if ($cancel_date) {