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

Merge branch 'master' into feature/dashboard

Browse Source 
# Conflicts:
#	application/models/eloquent/Projectemployee.php
This commit is contained in:
theo
2020-01-10 17:43:05 +01:00
parent 1295814ff4 5594865554
commit 090cc90de1
35 changed files with 6932 additions and 1991 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/pages/invoicereport_view.php
+13 -7
View File
@@ -48,9 +48,12 @@
<a class="nav-link"
data-bind="css:{'active':invoiceTab() == 'monthforecast'}">maand prognoses</a>
</li>
<li class="nav-item" data-bind="click:setActivetab.bind($data, 'monthpayments')" style="z-index:10">
<a class="nav-link" data-bind="css:{'active':invoiceTab() == 'monthpayments'}">maand betalingen</a>
</li>
<li class="nav-item" data-bind="click:setActivetab.bind($data, 'monthpayments')" style="z-index:10">
<a class="nav-link" data-bind="css:{'active':invoiceTab() == 'monthpayments'}">maand betalingen</a>
</li>
<li class="nav-item" data-bind="click:setActivetab.bind($data, 'invoices')" style="z-index:10">
<a class="nav-link" data-bind="css:{'active':invoiceTab() == 'invoices'}">ontvangen facturen</a>
</li>
<!-- <li class="nav-item" data-bind="click:setActivetab.bind($data, 'externals')" style="z-index:10">-->
<!-- <a class="nav-link" data-bind="css:{'active':invoiceTab() == 'externals'}">onderaannemers</a>-->
<!-- </li>-->
@@ -65,9 +68,12 @@
<div id="invoiceforecast" data-bind="visible:invoiceTab() == 'monthforecast'">
<?php $this->load->view('reports/invoices/monthforecast_report'); ?>
</div>
<div id="invoiceforecast" data-bind="visible:invoiceTab() == 'monthpayments'">
<?php $this->load->view('reports/invoices/monthpayment_report'); ?>
</div>
<div id="invoiceforecast" data-bind="visible:invoiceTab() == 'monthpayments'">
<?php $this->load->view('reports/invoices/monthpayment_report'); ?>
</div>
<div id="invoiceforecast" data-bind="visible:invoiceTab() == 'invoices'">
<?php $this->load->view('reports/invoices/invoices_report'); ?>
</div>
<!-- <div id="invoiceforecast" data-bind="visible:invoiceTab() == 'externals'">-->
<!-- --><?php //$this->load->view('reports/invoices/contractors_report'); ?>
<!-- </div>-->
@@ -76,4 +82,4 @@
</div>
</div>
</div>
</div>
</div>
application/views/pages/login/login_view.php
+1 -1
View File
@@ -92,7 +92,7 @@
</div>
<footer class="page-copyright page-copyright-inverse">
<p>© 2018. De Beleidsonderzoeker.</p>
<p>© 2018. De Beleidsonderzoekers</p>
<!-- <p style="font-size:.8em">powered by: Pensare Software</p>-->
</footer>
</div>
application/views/pages/reservations_view.php
+10 -10
View File
@@ -7,16 +7,16 @@
<table class="table table-condensed">
<thead>
<tr>
<th width="3%">&nbsp;</th>
<th width="17%">project</th>
<th width="10%" class="align-right">Kosten derden</th>
<th width="10%" class="align-right">factuur INK</th>
<th width="10%" class="align-right">budget gereserveerd</th>
<th width="10%" class="align-right">betaald</th>
<th width="10%" class="align-right">saldo te<br />betalen</th>
<th width="10%" class="align-right">betaald via<br />reserveringen</th>
<th width="10%" class="align-right">saldo reservering</th>
<th width="10%" class="align-right">saldo facturen INK</th>
<th width="2%">&nbsp;</th>
<th width="34%">project</th>
<th width="8%" class="align-right">Kosten derden</th>
<th width="8%" class="align-right">factuur INK</th>
<th width="8%" class="align-right">gereserveerd op<br/>spaarrekening</th>
<th width="8%" class="align-right">betaald</th>
<th width="8%" class="align-right">nog te betalen<br />facturen</th>
<th width="8%" class="align-right">betaald via<br />reserveringen</th>
<th width="8%" class="align-right">saldo reservering</th>
<th width="8%" class="align-right">saldo facturen INK</th>
</tr>
</thead>
<!-- ko foreach:projects -->