tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Include expense taxes in vendor summary

Browse source
This commit is contained in:
Hillel Coren 2018-11-06 16:57:27 +02:00
parent bfc356687e
commit 07e98da626
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Models/Vendor.php
View file

@ -338,7 +338,7 @@ class Vendor extends EntityModel
public function getTotalExpenses()
{
return DB::table('expenses')
->select('expense_currency_id', DB::raw('SUM(amount) as amount'))
->select('expense_currency_id', DB::raw('sum(expenses.amount + (expenses.amount * expenses.tax_rate1 / 100) + (expenses.amount * expenses.tax_rate2 / 100)) as amount'))
->whereVendorId($this->id)
->whereIsDeleted(false)
->groupBy('expense_currency_id')