Added payment_due and skonto to Address and Invoice
This commit is contained in:
@@ -483,6 +483,9 @@ class InvoiceController extends mfBaseController {
|
||||
$invoice_data["billingaddress_id"] = $billingaddress_id;
|
||||
$invoice_data["customer_number"] = $bill->customer_number;
|
||||
$invoice_data["fibu_account_number"] = $bill->fibu_account_number;
|
||||
$invoice_data["fibu_payment_due"] = $bill->fibu_payment_due;
|
||||
$invoice_data["fibu_payment_skonto"] = $bill->fibu_payment_skonto;
|
||||
$invoice_data["fibu_payment_skonto_rate"] = $bill->fibu_payment_skonto_rate;
|
||||
|
||||
|
||||
$invoice_data["sepa_date"] = $bill->sepa_date;
|
||||
@@ -674,7 +677,7 @@ class InvoiceController extends mfBaseController {
|
||||
$type = "credit";
|
||||
}
|
||||
|
||||
$csv_header = "\u{FEFF}satzart;konto;gkonto;belegnr;belegdatum;buchsymbol;buchcode;prozent;steuercode;betrag;steuer;text;kost;";
|
||||
$csv_header = "\u{FEFF}satzart;konto;gkonto;belegnr;belegdatum;zziel;skontopz;skontotage;buchsymbol;buchcode;prozent;steuercode;betrag;steuer;text;kost;";
|
||||
|
||||
if($type == "credit") {
|
||||
$csv_header .= "extbelegnr";
|
||||
@@ -797,6 +800,9 @@ class InvoiceController extends mfBaseController {
|
||||
$csv_out .= $invoice->fibu_cost_account.";";
|
||||
$csv_out .= $invoice->invoice_number.";";
|
||||
$csv_out .= date("d.m.Y", $invoice->invoice_date).";";
|
||||
$csv_out .= ($invoice->fibu_payment_due === null) ? ";" : $invoice->fibu_payment_due.";";
|
||||
$csv_out .= ($invoice->fibu_payment_skonto) ? $invoice->fibu_payment_skonto.";" : ";";
|
||||
$csv_out .= ($invoice->fibu_payment_skonto_rate) ? $invoice->fibu_payment_skonto_rate.";" : ";";
|
||||
$csv_out .= $buchsymbol.";";
|
||||
$csv_out .= $buchcode.";";
|
||||
$csv_out .= $vatrate.";";
|
||||
|
||||
@@ -7,6 +7,9 @@ class InvoiceModel {
|
||||
public $billingaddress_id;
|
||||
public $customer_number;
|
||||
public $fibu_account_number;
|
||||
public $fibu_payment_due;
|
||||
public $fibu_payment_skonto;
|
||||
public $fibu_payment_skonto_rate;
|
||||
public $sepa_date;
|
||||
public $sepa_id;
|
||||
public $sepa_last_date;
|
||||
|
||||
Reference in New Issue
Block a user