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 legacy_account in Vatrate

See merge request fronk/thetool!258
This commit is contained in:
Frank Schubert
2024-02-20 21:26:48 +00:00
parent 6ddad09943 b0cd82d0dd
commit 06da66bef7
4 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Layout/default/Vatgroup/Index.php
View File

@@ -49,6 +49,9 @@
<div class="col-2 font-weight-medium">
Erlöskonto
</div>
<div class="col-2 font-weight-medium">
Legacy Erlöskonto
</div>
<div class="col-2 font-weight-medium">
Steuersatz %
</div>
@@ -65,6 +68,9 @@
<div class="col-2">
<input type="text" class="form-control" name="rates[<?=$area_key?>][account]" value="<?=$vatgroup->rates[$area_key]->account?>" placeholder="Erlöskonto" />
</div>
<div class="col-2">
<input type="text" class="form-control" name="rates[<?=$area_key?>][legacy_account]" value="<?=$vatgroup->rates[$area_key]->legacy_account?>" placeholder="Legacy Erlöskonto" />
</div>
<div class="col-2">
<input type="text" class="form-control" name="rates[<?=$area_key?>][rate]" value="<?=str_replace(".",",", round($vatgroup->rates[$area_key]->rate, 2))?>" placeholder="Steuersatz %" />
</div>

5
application/Vatgroup/VatgroupController.php
View File

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

1
application/Vatrate/VatrateModel.php
View File

@@ -4,6 +4,7 @@ class VatrateModel {
public $vatgroup_id;
public $area;
public $account;
public $legacy_account;
public $rate;
public $invoice_text;

1
db/migrations/20240220192901_create_vat_tables.php
View File

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