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

Merge branch 'fronkdev' into 'master'

Browse Source 
Added payment_due and skonto to Address and Invoice

See merge request fronk/thetool!1526
This commit is contained in:
Frank Schubert
2025-07-08 16:35:10 +00:00
parent d5bb91925f 0109817148
commit 9c0778600d
9 changed files with 101 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Layout/default/Address/Form.php
View File

@@ -268,6 +268,28 @@
<input type="text" class="form-control" name="fibu_account_number" id="fibu_account_number" value="<?=$address->fibu_account_number?>" />
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="fibu_payment_due">Zahlungsziel</label>
<div class="col-lg-10">
<input type="text" class="form-control" name="fibu_payment_due" id="fibu_payment_due" value="<?=$address->fibu_payment_due?>" />
<small>Standard: <?=TT_ADDRESS_DEFAULT_PAYMENT_DUE?> Tage</small>
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="fibu_payment_skonto">Skontotage</label>
<div class="col-lg-10">
<input type="text" class="form-control" name="fibu_payment_skonto" id="fibu_supplier_skonto" value="<?=$address->fibu_payment_skonto?>" />
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="fibu_payment_skonto_rate">Skonto %</label>
<div class="col-lg-10">
<input type="text" class="form-control" name="fibu_payment_skonto_rate" id="fibu_payment_skonto_rate" value="<?=$address->fibu_payment_skonto_rate?>" />
</div>
</div>
<hr />

9
Layout/default/Address/View.php
View File

@@ -160,6 +160,15 @@
</tr><tr>
<th>Verrechnungskonto</th>
<td><?=$address->fibu_account_number?></td>
</tr><tr>
<th>Zahlungsziel</th>
<td><?=($address->fibu_payment_due) ? $address->fibu_payment_due." Tage" : ""?></td>
</tr><tr>
<th>Skontotage</th>
<td><?=$address->fibu_payment_skonto?></td>
</tr><tr>
<th>Skonto %</th>
<td><?=($address->fibu_payment_skonto_rate) ? $address->fibu_payment_skonto_rate." %" : ""?></td>
</tr><tr>
<th>Lieferantenkonto</th>
<td><?=$address->fibu_supplier_number?></td>

2
Layout/default/Address/bmd_export.csv.php
View File

@@ -1,5 +1,5 @@
<?php
$header = "\u{FEFF}FIBU Kontonummber;Zahlungsziel Lieferant;Skontotage;Skontoprozent;Zahlsperre;Vorname;Nachname;Straße Hausnummer;PLZ;Ort;Land;Telefon;Mail;UID;SEPA;Kontoinhaber;IBAN;BIC;customer_numbers\n";
$header = "\u{FEFF}FIBU Kontonummber;Zahlungsziel;Skontotage;Skontoprozent;Zahlsperre;Vorname;Nachname;Straße Hausnummer;PLZ;Ort;Land;Telefon;Mail;UID;SEPA;Kontoinhaber;IBAN;BIC;customer_numbers\n";
$this->setReturnValue(["header" => $header]);
foreach($addresses as $a):

6
application/Address/Address.php
View File

@@ -578,9 +578,9 @@ class Address extends mfBaseModel {
$a["fibu_supplier_skonto_rate"] = $address->fibu_supplier_skonto_rate;
$a["fibu_supplier_paymentblock"] = $address->fibu_supplier_paymentblock;
} else {
$a["fibu_supplier_due"] = "";
$a["fibu_supplier_skonto"] = "";
$a["fibu_supplier_skonto_rate"] = "";
$a["fibu_supplier_due"] = (is_numeric($address->fibu_payment_due)) ? $address->fibu_payment_due : TT_ADDRESS_DEFAULT_PAYMENT_DUE;
$a["fibu_supplier_skonto"] = $address->fibu_payment_skonto;
$a["fibu_supplier_skonto_rate"] = $address->fibu_payment_skonto_rate;
$a["fibu_supplier_paymentblock"] = "";
}
$a["street"] = $address->street;

4
application/Address/AddressController.php
View File

@@ -303,6 +303,10 @@ class AddressController extends mfBaseController {
$data['fibu_supplier_paymentblock'] = 0;
}
$data['fibu_payment_due'] = ($r->fibu_payment_due) ? trim($r->fibu_payment_due) : null;
$data['fibu_payment_skonto'] = ($r->fibu_payment_skonto) ? trim($r->fibu_payment_skonto) : null;
$data['fibu_payment_skonto_rate'] = ($r->fibu_payment_skonto_rate) ? trim($r->fibu_payment_skonto_rate) : null;
$data['fibu_supplier_due'] = ($r->fibu_supplier_due) ? trim($r->fibu_supplier_due) : null;
$data['fibu_supplier_skonto'] = ($r->fibu_supplier_skonto) ? trim($r->fibu_supplier_skonto) : null;
$data['fibu_supplier_skonto_rate'] = ($r->fibu_supplier_skonto_rate) ? trim($r->fibu_supplier_skonto_rate) : null;

3
application/Address/AddressModel.php
View File

@@ -4,6 +4,9 @@ class AddressModel {
public $parent_id;
public $customer_number;
public $fibu_account_number;
public $fibu_payment_due;
public $fibu_payment_skonto;
public $fibu_payment_skonto_rate;
public $fibu_supplier_number;
public $fibu_supplier_due;
public $fibu_supplier_skonto;

8
application/Invoice/InvoiceController.php
View File

@@ -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.";";

3
application/Invoice/InvoiceModel.php
View File

@@ -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;

49
db/migrations/20250708151354_address_add_payment_due.php Normal file
View File

@@ -0,0 +1,49 @@
<?php
declare(strict_types=1);
use Phinx\Migration\AbstractMigration;
final class AddressAddPaymentDue extends AbstractMigration
{
public function up(): void
{
if($this->getEnvironment() == "thetool") {
$address = $this->table("Address");
$address->addColumn("fibu_payment_due", "integer", ["null" => true, "default" => null, "after" => "fibu_account_number"]);
$address->addColumn("fibu_payment_skonto", "integer", ["null" => true, "default" => null, "after" => "fibu_payment_due"]);
$address->addColumn("fibu_payment_skonto_rate", "integer", ["null" => true, "default" => null, "after" => "fibu_payment_skonto"]);
$address->update();
$invoice = $this->table("Invoice");
$invoice->addColumn("fibu_payment_due", "integer", ["null" => true, "default" => null, "after" => "fibu_account_number"]);
$invoice->addColumn("fibu_payment_skonto", "integer", ["null" => false, "default" => 0, "after" => "fibu_payment_due"]);
$invoice->addColumn("fibu_payment_skonto_rate", "integer", ["null" => false, "default" => 0, "after" => "fibu_payment_skonto"]);
$invoice->update();
}
if($this->getEnvironment() == "addressdb") {
}
}
public function down(): void
{
if($this->getEnvironment() == "thetool") {
$address = $this->table("Address");
$address->removeColumn("fibu_payment_skonto_rate");
$address->removeColumn("fibu_payment_skonto");
$address->removeColumn("fibu_payment_due");
$address->update();
$invoice = $this->table("Invoice");
$invoice->removeColumn("fibu_payment_skonto_rate");
$invoice->removeColumn("fibu_payment_skonto");
$invoice->removeColumn("fibu_payment_due");
$invoice->update();
}
if($this->getEnvironment() == "addressdb") {
}
}
}