Merge branch 'fronkdev' into 'master'
PreorderBilling: changed price column to german format as string See merge request fronk/thetool!1267
This commit is contained in:
@@ -599,7 +599,7 @@ class PreorderBillingInvoiceController extends mfBaseController {
|
||||
if(count($invoice_detail_data)) {
|
||||
// create CSV file
|
||||
//var_dump($invoice_detail_data);exit;
|
||||
$csv = "\u{FEFF}Netzbetreiber;Rechungsnummer;Rechnungsdateum;Netzgebiet;OAID;Extref;Bestelldatum;Periode von;Periode bis;Artikelnummer;Produkt;Anzahl;Preis Netto\n";
|
||||
$csv = "\u{FEFF}Netzbetreiber;Rechungsnummer;Rechnungsdatum;Netzgebiet;OAID;Extref;Bestelldatum;Periode von;Periode bis;Artikelnummer;Produkt;Anzahl;Preis Netto\n";
|
||||
foreach ($invoice_detail_data as $detail) {
|
||||
//var_dump($detail);
|
||||
//exit;
|
||||
@@ -616,7 +616,7 @@ class PreorderBillingInvoiceController extends mfBaseController {
|
||||
$csv .= '"'.$detail["article_number"].'";';
|
||||
$csv .= '"'.$detail["product_name"].'";';
|
||||
$csv .= round($detail["amount"], 3).';';
|
||||
$csv .= round($detail["price"], 2)."\n";
|
||||
$csv .= '"'.number_format($detail["price"], 2, ",","").'"'."\n";
|
||||
}
|
||||
|
||||
$subfolder = TT_PREORDER_BILLING[$invoice->netowner_id]["subfolder"]."/".$today->format("Y");
|
||||
|
||||
Reference in New Issue
Block a user