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

Diversen nav opmerkingen

Browse Source
This commit is contained in:
theo
2018-05-05 20:55:18 +02:00
parent b589058437
commit a3d200c38b
10 changed files with 156 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/beheer/vatController.php
+5
View File
@@ -33,4 +33,9 @@ class vatController extends MY_Controller {
$this->json($vats);
}
public function addVat()
{
Vat::create([]);
}
}
application/models/eloquent/queries/Qinvoiceoverview.php
+1 -3
View File
@@ -23,7 +23,6 @@ class Qinvoiceoverview {
CONCAT(firstname, ' ', middlename, ' ', lastname) AS fullname,
( SELECT vatrate FROM vats WHERE archive = 'F' LIMIT 1 ) AS vatrate,
COALESCE(reserved, 0 ) AS reserved,
COALESCE(reservedpayed, 0 ) AS reservedpayed,
COALESCE(currentforecast, 0) AS currentforecast,
COALESCE(otherforecast, 0) AS otherforecast
FROM invoices INV
@@ -47,8 +46,7 @@ class Qinvoiceoverview {
ON INV.id = Q1.invoice_id
LEFT JOIN (
SELECT project_id,
SUM(IF(payed='UNPAYED', reservationamount, 0)) reserved,
SUM(IF(payed='PAYED', reservationamount, 0)) reservedpayed
SUM( reservationamount) reserved
FROM reservations
GROUP BY project_id
) AS Q2
application/views/modals/partials/_hours.php
+2 -2
View File
@@ -7,7 +7,7 @@
<div class="panel-body panel-body-project">
<table class="table table-sm">
<thead>
<th class="table-cyanish-header" width="35%">
<th class="table-cyanish-header" width="32%">
medewerker
</th>
<th class="table-cyanish-header" width="15%">
@@ -16,7 +16,7 @@
<th class="table-cyanish-header" width="15%">
declarabel
</th>
<th class="table-cyanish-header align-right" width="12%">
<th class="table-cyanish-header align-right" width="15%">
uren
</th>
<th class="table-cyanish-header align-right" width="15%">
application/views/modals/partials/_invoices.php
+1 -1
View File
@@ -4,7 +4,7 @@
uitgaande facturen
</h3>
</div>
<div class="panel-body panel-body-project">
<div class="panel-body panel-body-project" style="overflow-y:scroll;">
<table class="table table-sm">
<thead>
<th class="table-cyanish-header">&nbsp;</th>
application/views/pages/vat_view.php
+33
View File
@@ -0,0 +1,33 @@
<div class="VAT">
<div class="row">
<div class="col-md-4">
<table class="table table-condensed">
<thead>
<tr>
<th>percentage</th>
<th></th>
</tr>
</thead>
<tbody data-bind="foreach:vats">
<tr>
<td>
<input type="text" data-bind="text:vatrate" />
</td>
<td width="60px">
<i class="icon fa-sellsy"></i>
<i class="icon fa-edit" data-bind="click:$root.toggleEdit"></i>
<i class="icon fa-trash redish" data-bind="$root.removeVat"></i>
</td>
</tr>
</tbody>
<tfoot>
<tr>
<th colspan="2">
<button class="btn btn-primary" data-bind="click:addVat">voeg btw toe</button>
</th>
</tr>
</tfoot>
</table>
</div>
</div>
</div>
application/views/partials/_js.php
+1
View File
@@ -28,6 +28,7 @@
<script src="js/lib/modules/beheer/usersModule.js?version=<?= $this->version ?>"></script>
<script src="js/lib/modules/beheer/customersModule.js?version=<?= $this->version ?>"></script>
<script src="js/lib/modules/beheer/externalsModule.js?version=<?= $this->version ?>"></script>
<script src="js/lib/modules/beheer/vatModule.js?version=<?= $this->version ?>"></script>
<script src="js/lib/modules/projects/offersModule.js?version=<?= $this->version ?>"></script>
<script src="js/lib/modules/projects/projectsModule.js?version=<?= $this->version ?>"></script>
<script src="js/lib/modules/projects/employeehoursModule.js?version=<?= $this->version ?>"></script>
application/views/reports/invoices/_invoicetable.php
+26 -8
View File
@@ -4,10 +4,10 @@
<th class="rotate">
<div><span>project</span></div>
</th>
<th class="rotate">
<th class="rotate" width="150px">
<div><span>klant</span></div>
</th>
<th class="rotate">
<th class="rotate" width="100px">
<div><span>status afgehandeld</span></div>
</th>
<!-- <th class="rotate">-->
@@ -43,17 +43,17 @@
</th>
<!-- /ko -->
<!-- ko if:$root.invoiceTab() == 'forecast' -->
<th class="rotate">
<th class="rotate" width="100px">
<div><span>nog te factureren (incl.btw)</span></div>
</th>
<th class="rotate">
<th class="rotate" width="100px">
<div><span>nog te factureren lopend jaar</span></div>
</th>
<th class="rotate">
<th class="rotate" width="100px">
<div><span>nog te factureren na lopend jaar</span></div>
</th>
<th class="rotate">
<div><span>verschil prognose - werkelijk</span></div>
<th class="rotate" width="100px">
<div><span>nog te prognotiseren</span></div>
</th>
<!-- /ko -->
<!-- ko if:$root.invoiceTab() == 'monthforecast' -->
@@ -133,7 +133,7 @@
<i class="icon fa-euro"></i>
<span data-bind="text:otherforecast"></span>
</td>
<th class="align-right">
<th class="align-right focus-green">
<i class="icon fa-euro"></i>
<span data-bind="text:missingForecast"></span>
</th>
@@ -171,6 +171,24 @@
<th colspan="3" class="align-right">
totaal
</th>
<!-- ko if:$root.invoiceTab() == 'forecast' -->
<th class="align-right">
<i class="icon fa-euro"></i>
<span data-bind="text:totalToInvoice"></span>
</th>
<th class="align-right">
<i class="icon fa-euro"></i>
<span data-bind="text:totalCurrentforecast"></span>
</th>
<th class="align-right">
<i class="icon fa-euro"></i>
<span data-bind="text:totalOtherforecast"></span>
</th>
<th class="align-right focus-green">
<i class="icon fa-euro"></i>
<span data-bind="text:totalMissingForecast"></span>
</th>
<!-- /ko -->
<!-- ko if:$root.invoiceTab() == 'monthforecast' -->
<th class="align-right">
<i class="icon fa-euro"></i>