diff --git a/Layout/default/Address/Form.php b/Layout/default/Address/Form.php
index 4512bf3bb..401696a18 100644
--- a/Layout/default/Address/Form.php
+++ b/Layout/default/Address/Form.php
@@ -254,7 +254,9 @@
-
+
+
+
+
+
diff --git a/Layout/default/Address/Index.php b/Layout/default/Address/Index.php
index 5fb7a9824..b5a06bb51 100644
--- a/Layout/default/Address/Index.php
+++ b/Layout/default/Address/Index.php
@@ -39,10 +39,11 @@
@@ -259,6 +260,30 @@
diff --git a/Layout/default/Address/View.php b/Layout/default/Address/View.php
index 409d928da..9af125451 100644
--- a/Layout/default/Address/View.php
+++ b/Layout/default/Address/View.php
@@ -137,6 +137,9 @@
| Lieferant Skonto % |
=$address->fibu_supplier_skonto_rate?> |
+
+ | Lieferant Zahlsperre |
+ =($address->fibu_supplier_paymentblock) ? " Automatische Zahlungen gesperrt" : "Nicht gesperrt"?> |
Zusatzdaten |
diff --git a/Layout/default/Address/bmd_export.csv.php b/Layout/default/Address/bmd_export.csv.php
index 1ca733dfc..49f51a8d6 100644
--- a/Layout/default/Address/bmd_export.csv.php
+++ b/Layout/default/Address/bmd_export.csv.php
@@ -1,10 +1,10 @@
setReturnValue(["header" => $header]);
foreach($addresses as $a):
?>
-=$a["fibu_account_number"]?>;=$a["fibu_supplier_due"]?>;=$a["fibu_supplier_skonto"]?>;=$a["fibu_supplier_skonto_rate"]?>;=$this->nl2ws($a["firstname"])?>;=$this->nl2ws($a["lastname"])?>;=$this->nl2ws($a["street"])?>;=$this->nl2ws($a["zip"])?>;=$this->nl2ws($a["city"])?>;=$this->nl2ws($a["countrycode"])?>;=$this->nl2ws($a["phone"])?>;=$this->nl2ws($a["email"])?>;=$this->nl2ws($a["uid"])?>;=$a["billing_type"]?>;=$a["bank_owner"]?>;=$a["iban"]?>;=$a["bic"]?>;=implode(" ",$a["customer_numbers"])?>
+=$a["fibu_account_number"]?>;=$a["fibu_supplier_due"]?>;=$a["fibu_supplier_skonto"]?>;=$a["fibu_supplier_skonto_rate"]?>;=$a["fibu_supplier_paymentblock"]?>;=$this->nl2ws($a["firstname"])?>;=$this->nl2ws($a["lastname"])?>;=$this->nl2ws($a["street"])?>;=$this->nl2ws($a["zip"])?>;=$this->nl2ws($a["city"])?>;=$this->nl2ws($a["countrycode"])?>;=$this->nl2ws($a["phone"])?>;=$this->nl2ws($a["email"])?>;=$this->nl2ws($a["uid"])?>;=$a["billing_type"]?>;=$a["bank_owner"]?>;=$a["iban"]?>;=$a["bic"]?>;=implode(" ",$a["customer_numbers"])?>
customer_number;
$a["fibu_account_number"] = $fibu_num;
//$a["fibu_supplier_number"] = $address->fibu_supplier_number;
- $a["fibu_supplier_due"] = (is_numeric($address->fibu_supplier_due)) ? $address->fibu_supplier_due : TT_ADDRESS_DEFAULT_SUPPLIER_DUE;
- $a["fibu_supplier_skonto"] = $address->fibu_supplier_skonto;
- $a["fibu_supplier_skonto_rate"] = $address->fibu_supplier_skonto_rate;
+ if($fibu_num >= 300000 && $fibu_num < 400000) {
+ $a["fibu_supplier_due"] = (is_numeric($address->fibu_supplier_due)) ? $address->fibu_supplier_due : TT_ADDRESS_DEFAULT_SUPPLIER_DUE;
+ $a["fibu_supplier_skonto"] = $address->fibu_supplier_skonto;
+ $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_paymentblock"] = "";
+ }
$a["street"] = $address->street;
$a["zip"] = $address->zip;
$a["city"] = $address->city;
@@ -455,6 +463,13 @@ class AddressController extends mfBaseController {
} else {
$data['fibu_primary_account'] = 0;
}
+
+ if($r->fibu_supplier_paymentblock) {
+ $data['fibu_supplier_paymentblock'] = 1;
+ } else {
+ $data['fibu_supplier_paymentblock'] = 0;
+ }
+
$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;
diff --git a/db/migrations/20240123132303_address_add_fibu_supplier_paymentblock.php b/db/migrations/20240123132303_address_add_fibu_supplier_paymentblock.php
new file mode 100644
index 000000000..412b71a0b
--- /dev/null
+++ b/db/migrations/20240123132303_address_add_fibu_supplier_paymentblock.php
@@ -0,0 +1,31 @@
+getEnvironment() == "thetool") {
+ $table = $this->table("Address");
+ $table->addColumn("fibu_supplier_paymentblock", "integer", ["null" => false, "default" => 0, "limit" => \Phinx\Db\Adapter\MysqlAdapter::INT_TINY, "after" => "fibu_supplier_skonto_rate"]);
+ $table->update();
+ }
+
+ if($this->getEnvironment() == "addressdb") {
+
+ }
+ }
+
+ public function down(): void
+ {
+ if($this->getEnvironment() == "thetool") {
+ $this->table("Address")->removeColumn("fibu_supplier_paymentblock")->save();
+ }
+
+ if($this->getEnvironment() == "addressdb") {
+
+ }
+ }
+}