shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:akaunting/akaunting

Browse Source
This commit is contained in:
Cüneyt Şentürk 2023-04-05 14:41:07 +03:00
commit 173af142cf
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Requests/Setting/Tax.php
View File

@ -32,7 +32,7 @@ class Tax extends FormRequest
return [
'name' => 'required|string',
'rate' => 'required|min:0|max:100',
'rate' => 'required|numeric|min:0|max:100',
'type' => $type,
'enabled' => $enabled,
];

2
app/Traits/Import.php
View File

@ -331,7 +331,7 @@ trait Import
$data = [
'company_id' => company_id(),
'type' => $row['item_type'],
'type' => !empty($row['item_type']) ? $row['item_type'] : (!empty($row['type']) ? $row['type'] : 'product'),
'name' => $row['item_name'],
'description' => !empty($row['item_description']) ? $row['item_description'] : null,
'sale_price' => !empty($row['sale_price']) ? $row['sale_price'] : (!empty($row['price']) ? $row['price'] : 0),