diff --git a/Layout/default/Vatgroup/Index.php b/Layout/default/Vatgroup/Index.php
index 726720e66..c9f95c7c3 100644
--- a/Layout/default/Vatgroup/Index.php
+++ b/Layout/default/Vatgroup/Index.php
@@ -49,6 +49,9 @@
Erlöskonto
+
+ Legacy Erlöskonto
+
Steuersatz %
@@ -65,6 +68,9 @@
+
+
+
rates[$area_key]->rate, 2))?>" placeholder="Steuersatz %" />
diff --git a/application/Vatgroup/VatgroupController.php b/application/Vatgroup/VatgroupController.php
index ca47a946e..94f4250c4 100644
--- a/application/Vatgroup/VatgroupController.php
+++ b/application/Vatgroup/VatgroupController.php
@@ -70,6 +70,7 @@ class VatgroupController extends mfBaseController {
$data["vatgroup_id"] = $group->id;
$data["area"] = $area;
$data["account"] = trim($rate["account"]);
+ $data["legacy_account"] = (trim($rate["legacy_account"])) ? trim($rate["legacy_account"]) : null;
$data["rate"] = str_replace(",",".", trim($rate["rate"]));
$data["invoice_text"] = (trim($rate["invoice_text"])) ? trim($rate["invoice_text"]) : null;
@@ -77,6 +78,10 @@ class VatgroupController extends mfBaseController {
$this->layout()->setFlash("Ungültige Erlöskontonummer", "error");
$this->redirect("Vatgroup");
}
+ if($data["legacy_account"] && !is_numeric($data["legacy_account"])) {
+ $this->layout()->setFlash("Ungültige Legacy Erlöskontonummer", "error");
+ $this->redirect("Vatgroup");
+ }
if(!is_numeric($data["rate"])) {
$this->layout()->setFlash("Ungültiger Steuersatz", "error");
$this->redirect("Vatgroup");
diff --git a/application/Vatrate/VatrateModel.php b/application/Vatrate/VatrateModel.php
index 89f915a61..00f987614 100644
--- a/application/Vatrate/VatrateModel.php
+++ b/application/Vatrate/VatrateModel.php
@@ -4,6 +4,7 @@ class VatrateModel {
public $vatgroup_id;
public $area;
public $account;
+ public $legacy_account;
public $rate;
public $invoice_text;
diff --git a/db/migrations/20240220192901_create_vat_tables.php b/db/migrations/20240220192901_create_vat_tables.php
index f7295527a..2b7af7e60 100644
--- a/db/migrations/20240220192901_create_vat_tables.php
+++ b/db/migrations/20240220192901_create_vat_tables.php
@@ -21,6 +21,7 @@ final class CreateVatTables extends AbstractMigration
$table->addColumn("vatgroup_id", "integer", ["null" => false]);
$table->addColumn("area", "enum", ["null" => false, "values" => "domestic,eu,other"]);
$table->addColumn("account", "integer", ["null" => false]);
+ $table->addColumn("legacy_account", "integer", ["null" => true, "default" => null]);
$table->addColumn("rate", "decimal", ["null" => false, "precision" => 6, "scale" => 2]);
$table->addColumn("invoice_text", "text", ["null" => true, "default" => null]);
$table->addColumn("create_by", "integer", ["null" => false]);