Overigen/dbois
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Diverse wijzigingen

Browse Source
This commit is contained in:
theo
2018-05-05 13:22:14 +02:00
parent 860c5db95a
commit b589058437
13 changed files with 105 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/projects/Invoices_model.php
+22 -16
View File
@@ -27,22 +27,28 @@ class Invoices_model extends MY_Model {
public function getOutstandingPerProject( $projectID )
{
$this->sql = "
SELECT (own_revenue + other_revenue) AS totalrevenue,
ROUND(SUM(INV.invoiceamount * ((100 + vatrate) / 100)), 0) AS totalinvoiced,
SUM(payed) AS payed
FROM invoices INV
JOIN projects PRJ
ON PRJ.id = INV.project_id
JOIN vats VTS
ON VTS.id = INV.vat_id
JOIN offers OFF
ON PRJ.id = OFF.project_id
LEFT JOIN (
SELECT SUM(paymentamount) payed, invoice_id
FROM payments
) PAY
ON INV.id = PAY.invoice_id
WHERE PRJ.id = {$projectID} ";
SELECT (own_revenue + other_revenue) AS totalrevenue,
ROUND(SUM(INV.invoiceamount * ((100 + vatrate) / 100)), 0) AS totalinvoiced,
(
SELECT SUM(paymentamount) PAYMENTAMOUNT
FROM payments PAY
JOIN invoices INV
ON INV.id = PAY.invoice_id
WHERE INV.project_id = {$projectID}
) AS payed
FROM invoices INV
JOIN projects PRJ
ON PRJ.id = INV.project_id
JOIN (
SELECT vatrate, id
FROM vats
WHERE active = 'T'
AND archive = 'F'
) VTS
ON VTS.id = INV.vat_id
JOIN offers OFF
ON PRJ.id = OFF.project_id
WHERE PRJ.id = {$projectID} ";
$invoiceDetails = $this->get_query_row();