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

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;