no message
This commit is contained in:
+6
-15
@@ -1605,16 +1605,14 @@ public function GenerateInvoices()
|
|||||||
$this->FormatCurrency($row['rev_zev'], false),
|
$this->FormatCurrency($row['rev_zev'], false),
|
||||||
$this->FormatCurrency($row['subtotal'], false)
|
$this->FormatCurrency($row['subtotal'], false)
|
||||||
]);
|
]);
|
||||||
$this->PdfTableRow($pdf, [
|
|
||||||
['width' => 154, 'align' => 'R'],
|
|
||||||
['width' => 26, 'align' => 'R']
|
|
||||||
], [
|
|
||||||
'Zwischentotal ' . $row['name'],
|
|
||||||
$this->FormatCurrency($row['subtotal'], false)
|
|
||||||
], true, true);
|
|
||||||
}
|
}
|
||||||
$this->PdfTableRow($pdf, $amountColumns, [
|
$this->PdfTableRow($pdf, $amountColumns, [
|
||||||
'Zwischentotal Elektrizität', '', '', '', '', $this->FormatCurrency($result['sum'], false)
|
'Zwischentotal Elektrizität',
|
||||||
|
$this->FormatCurrency($result['totals']['cost_solar'], false),
|
||||||
|
$this->FormatCurrency($result['totals']['cost_grid'], false),
|
||||||
|
$this->FormatCurrency($result['totals']['rev_feedin'], false),
|
||||||
|
$this->FormatCurrency($result['totals']['rev_zev'], false),
|
||||||
|
$this->FormatCurrency($result['sum'], false)
|
||||||
], true, true);
|
], true, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1646,13 +1644,6 @@ public function GenerateInvoices()
|
|||||||
number_format($row['tariff_price'], 3, '.', "'"),
|
number_format($row['tariff_price'], 3, '.', "'"),
|
||||||
$this->FormatCurrency($row['cost'], false)
|
$this->FormatCurrency($row['cost'], false)
|
||||||
]);
|
]);
|
||||||
$this->PdfTableRow($pdf, [
|
|
||||||
['width' => 158, 'align' => 'R'],
|
|
||||||
['width' => 22, 'align' => 'R']
|
|
||||||
], [
|
|
||||||
'Zwischentotal ' . $row['name'],
|
|
||||||
$this->FormatCurrency($row['cost'], false)
|
|
||||||
], true, true);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user