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

diversen opmerkingen Peter

Browse Source
This commit is contained in:
theo
2018-04-02 17:32:20 +02:00
parent 0fd25f359b
commit 1b0ad5de83
5 changed files with 79 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/eloquent/queries/Qinvoiceoverview.php
+4 -2
View File
@@ -16,8 +16,8 @@ class Qinvoiceoverview {
PRJ.projectname,
(own_revenue + other_revenue ) AS revenues,
CUS.name AS customername,
SUM(IF( YEAR(invoicedate) = {$year},invoiceamount, 0)) AS currentyear,
SUM(IF( YEAR(invoicedate) != {$year},invoiceamount, 0)) AS otheryear,
SUM(IF( YEAR(invoicedate) = {$year}, invoiceamount* ((100 + vts.vatrate)/100), 0)) AS currentyear,
SUM(IF( YEAR(invoicedate) != {$year}, invoiceamount * ((100 + vts.vatrate)/100), 0)) AS otheryear,
SUM(COALESCE(Q1.currentyearpayed, 0)) AS currentyearpayed,
SUM(COALESCE(Q1.otheryearpayed, 0)) AS otheryearpayed,
CONCAT(firstname, ' ', middlename, ' ', lastname) AS fullname,
@@ -35,6 +35,8 @@ class Qinvoiceoverview {
ON CUS.id = PRJ.customer_id
JOIN users USR
ON USR.id = PRJ.projectleader_id
JOIN vats VTS
ON VTS.id = INV.vat_id
LEFT JOIN (
SELECT invoice_id,
SUM(IF(YEAR(paymentdate) = {$year},paymentamount, 0)) AS currentyearpayed,
application/views/reports/employeehours/employeemonthhours_view.php
+1 -1
View File
@@ -27,7 +27,7 @@
<td class="align-right"><span data-bind="text:target"></span></td>
<td class="align-right"><span data-bind="text:occupancyRateTotal"></span>%</td>
<td class="align-right"><span data-bind="text:occupancyRateHours"></span>%</td>
<td class="align-right"><span data-bind="text:occupancyRateInvoice"></span></td>
<td class="align-right"><span data-bind="text:occupancyRateInvoice"></span>%</td>
<td class="align-right"><i class="icon fa-euro"></i> <span data-bind="text:revenues"></span></td>
<td class="align-right"><i class="icon fa-euro"></i> <span data-bind="text:averageDayRate"></span></td>
</tr>
application/views/reports/invoices/_invoicetable.php
+37 -9
View File
@@ -10,9 +10,9 @@
<th class="rotate">
<div><span>status afgehandeld</span></div>
</th>
<th class="rotate">
<div><span>projectleider</span></div>
</th>
<!-- <th class="rotate">-->
<!-- <div><span>projectleider</span></div>-->
<!-- </th>-->
<!-- ko if:$root.invoiceTab() == 'invoice' -->
<th class="rotate">
<div><span>te factureren(excl btw)</span></div>
@@ -27,7 +27,7 @@
<div><span>gefactureerd lopend jaar(incl btw)</span></div>
</th>
<th class="rotate">
<div><span>totaal gefactureerd(incl btw)</span></div>
<div><span>totaal gefactureerd</span></div>
</th>
<th class="rotate">
<div><span>betaald voorgaande jaren</span></div>
@@ -44,7 +44,7 @@
<!-- /ko -->
<!-- ko if:$root.invoiceTab() == 'forecast' -->
<th class="rotate">
<div><span>nog te factureren</span></div>
<div><span>nog te factureren (incl.btw)</span></div>
</th>
<th class="rotate">
<div><span>nog te factureren lopend jaar</span></div>
@@ -56,9 +56,20 @@
<div><span>verschil prognose - werkelijk</span></div>
</th>
<!-- /ko -->
<!-- ko if:$root.invoiceTab() == 'monthforecast' || $root.invoiceTab() == 'monthpayments' -->
<!-- ko if:$root.invoiceTab() == 'monthforecast' -->
<th class="rotate">
<div><span>te factureren(incl btw)</span></div>
</th>
<!-- ko foreach:months -->
<th><span data-bind="text:month"></span></th>
<th class="rotate"><div><span data-bind="text:month"></span></div></th>
<!-- /ko -->
<th class="rotate">
<div><span>te factureren volgende jaren</span></div>
</th>
<!-- /ko -->
<!-- ko if:$root.invoiceTab() == 'monthpayments' -->
<!-- ko foreach:months -->
<th class="rotate"><div><span data-bind="text:month"></span></div></th>
<!-- /ko -->
<!-- /ko -->
</tr>
@@ -69,7 +80,7 @@
<td><span data-bind="text:projectnumber"></span></td>
<td><span data-bind="text:customername"></span></td>
<td><span data-bind="text:statusProject == 'CLOSED' ? 'afgesloten' : 'open'"></span></td>
<td><span data-bind="text:fullname"></span>
<!-- <td><span data-bind="text:fullname"></span>-->
</td>
<!-- ko if:$root.invoiceTab() == 'invoice' -->
<td class="align-right">
@@ -128,12 +139,21 @@
</th>
<!-- /ko -->
<!-- ko if:$root.invoiceTab() == 'monthforecast' -->
<td class="align-right">
<i class="icon fa-euro"></i>
<span data-bind="text:toInvoice"></span>
</td>
<!-- ko foreach:months -->
<td class="align-right">
<span data-bind="text:forecastamount">
</span>
</td>
<!-- /ko -->
<td class="align-right">
<i class="icon fa-euro"></i>
<span data-bind="text:toInvoiceFuture">
</span>
</td>
<!-- /ko -->
<!-- ko if:$root.invoiceTab() == 'monthpayments' -->
<!-- ko foreach:months -->
@@ -148,16 +168,24 @@
</tbody>
<tfoot>
<tr>
<th colspan="4" class="align-right">
<th colspan="3" class="align-right">
totaal
</th>
<!-- ko if:$root.invoiceTab() == 'monthforecast' -->
<th class="align-right">
<i class="icon fa-euro"></i>
<span data-bind="text:totalToInvoice"></span>
</th>
<!-- ko foreach:months -->
<th class="align-right">
<span data-bind="text:dbo.helpers.numberWithPoints($root['forecast' + month]())">
</span>
</th>
<!-- /ko -->
<th class="align-right">
<i class="icon fa-euro"></i>
<span data-bind="text:totalToInvoiceFuture"></span>
</th>
<!-- /ko -->
<!-- ko if:$root.invoiceTab() == 'monthpayments' -->
<!-- ko foreach:months -->