Sultan
/
invoiceninja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for expense exports

This commit is contained in:
David Bomba 2025-08-17 08:20:03 +10:00
parent 77597a3d7b
commit fbe029e061
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -265,6 +265,7 @@ class ExpenseExport extends BaseExport
$entity['expense.net_amount'] = round($expense->amount, $precision) - $total_tax_amount;
} else {
$entity['expense.net_amount'] = round($expense->amount, $precision);
$entity['expense.amount'] = round($expense->amount, $precision) + $total_tax_amount;
}
} else {
@ -274,7 +275,8 @@ class ExpenseExport extends BaseExport
$entity['expense.net_amount'] = round(($expense->amount - round($total_tax_amount, $precision)), $precision);
} else {
$total_tax_amount = ($expense->amount * (($expense->tax_rate1 ?? 0) / 100)) + ($expense->amount * (($expense->tax_rate2 ?? 0) / 100)) + ($expense->amount * (($expense->tax_rate3 ?? 0) / 100));
$entity['expense.net_amount'] = round(($expense->amount + round($total_tax_amount, $precision)), $precision);
$entity['expense.net_amount'] = round($expense->amount, $precision);
$entity['expense.amount'] = round($expense->amount, $precision) + $total_tax_amount;
}
}