Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for expense reports

Browse Source
This commit is contained in:
David Bomba 2024-07-02 10:21:34 +10:00
parent 52e4931b68
commit bb23241291
3 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Export/CSV/ExpenseExport.php
View File

@ -259,10 +259,17 @@ class ExpenseExport extends BaseExport
{
$precision = $expense->currency->precision ?? 2;
$entity['expense.net_amount'] = round($expense->amount, $precision);
if($expense->calculate_tax_by_amount) {
$total_tax_amount = round($expense->tax_amount1 + $expense->tax_amount2 + $expense->tax_amount3, $precision);
if($expense->uses_inclusive_taxes) {
$entity['expense.net_amount'] = round($expense->amount, $precision) - $total_tax_amount;
}
else {
$entity['expense.net_amount'] = round($expense->amount, $precision);
}
} else {
if($expense->uses_inclusive_taxes) {

2
app/Repositories/TaskRepository.php
View File

@ -261,7 +261,7 @@ class TaskRepository extends BaseRepository
public function roundTimeLog(int $start_time, int $end_time): int
{
if($this->task_round_to_nearest == 1 || $end_time == 0) {
if(in_array($this->task_round_to_nearest, [0,1]) || $end_time == 0) {
return $end_time;
}

16
tests/Feature/TaskApiTest.php
View File

@ -189,6 +189,22 @@ class TaskApiTest extends TestCase
}
public function testTaskDivisionByZero()
{
$data = [
"rate" => 0,
"time_log" => '[[1719350900,1719352700,"",true]]',
];
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token,
])->postJson("/api/v1/tasks", $data);
$response->assertStatus(200);
}
public function testRequestRuleParsing()
{