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 taxcode to Vatrate

See merge request fronk/thetool!270
This commit is contained in:
Frank Schubert
2024-02-27 13:38:22 +00:00
parent 2b09a167dc 6db1055c6b
commit f611f5201a
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,26 +43,29 @@
<input type="hidden" name="id" value="<?=$vatgroup->id?>" />
<div class="row">
<div class="col-2 font-weight-medium">
<div class="col-1 font-weight-medium">
Zielland *
</div>
<div class="col-2 font-weight-medium">
Erlöskonto *
</div>
<div class="col-2 font-weight-medium">
Legacy Erlöskonto
Legacy Erlöskonto *
</div>
<div class="col-2 font-weight-medium">
Steuersatz % *
</div>
<div class="col-4 font-weight-medium">
<div class="col-2 font-weight-medium">
Steuercode *
</div>
<div class="col-3 font-weight-medium">
Rechnungstext
</div>
</div>
<?php foreach(TT_VATRATE_AREAS as $area_key => $area_name): ?>
<div class="row mb-2">
<div class="col-2">
<div class="col-1">
<input type="text" class="form-control" value="<?=$area_name?>" disabled="disabled" />
</div>
<div class="col-2">
@@ -74,7 +77,10 @@
<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>
<div class="col-4">
<div class="col-2">
<input type="text" class="form-control" name="rates[<?=$area_key?>][taxcode]" value="<?=str_replace(".",",", $vatgroup->rates[$area_key]->taxcode)?>" placeholder="Steuercode" />
</div>
<div class="col-3">
<input type="text" class="form-control" name="rates[<?=$area_key?>][invoice_text]" value="<?=htmlentities($vatgroup->rates[$area_key]->invoice_text)?>" placeholder="Optionaler Rechnungstext" />
</div>
</div>

5
application/Vatgroup/VatgroupController.php
View File

@@ -72,6 +72,7 @@ class VatgroupController extends mfBaseController {
$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["taxcode"] = ($rate["taxcode"]) ? trim($rate["taxcode"]) : null;
$data["invoice_text"] = (trim($rate["invoice_text"])) ? trim($rate["invoice_text"]) : null;
if(!$data["account"] || !is_numeric($data["account"])) {
@@ -86,6 +87,10 @@ class VatgroupController extends mfBaseController {
$this->layout()->setFlash("Ungültiger Steuersatz", "error");
$this->redirect("Vatgroup");
}
if($data["taxcode"] && !is_numeric($data["taxcode"])) {
$this->layout()->setFlash("Ungültiger Steuercode", "error");
$this->redirect("Vatgroup");
}
$vatrate = VatrateModel::getFirst(["vatgroup_id" => $group->id, "area" => $area]);
if($vatrate) {

1
application/Vatrate/VatrateModel.php
View File

@@ -6,6 +6,7 @@ class VatrateModel {
public $account;
public $legacy_account;
public $rate;
public $taxcode;
public $invoice_text;
public $create_by = null;

1
db/migrations/20240220192901_create_vat_tables.php
View File

@@ -24,6 +24,7 @@ final class CreateVatTables extends AbstractMigration
$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("taxcode", "integer", ["null" => true, "default" => null]);
$table->addColumn("invoice_text", "text", ["null" => true, "default" => null]);
$table->addColumn("create_by", "integer", ["null" => false]);
$table->addColumn("edit_by", "integer", ["null" => false]);