Merge branch 'fronkdev' into 'master'

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
4 changed files with 18 additions and 5 deletions

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>