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

Merge branch 'master' of bitbucket.org:pensare/dbois

Browse Source 
# Conflicts:
#	application/controllers/projects/EmployeeHoursController.php
#	application/views/pages/employeehours_view.php
#	public/js/lib/modules/projects/employeehoursModule.js
This commit is contained in:
theo
2018-04-02 17:34:19 +02:00
parent 1b0ad5de83 6170bb6f08
commit 2f3b1439e8
15 changed files with 137 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/reports/monthlyemployeehours/euro_view.php
+29 -29
View File
@@ -22,17 +22,17 @@
</th>
<!-- /ko -->
<th class="rotate">
<div><span>totaal</span></div>
<div><span>eigen budget beschikbaar (ex btw)</span></div>
</th>
<th class="rotate">
<div><span>budget (ex btw)</span></div>
</th>
<th class="rotate">
<div><span>derden (ex btw)</span></div>
</th>
<th class="rotate">
<div><span>beschikbaar</span></div>
<div><span>totaal geschreven omzet</span></div>
</th>
<!-- <th class="rotate">-->
<!-- <div><span>derden (ex btw)</span></div>-->
<!-- </th>-->
<!-- <th class="rotate">-->
<!-- <div><span>beschikbaar</span></div>-->
<!-- </th>-->
<th class="rotate">
<div><span>saldo</span></div>
</th>
@@ -58,21 +58,21 @@
<span data-bind="text:revenues"></span>
</td>
<!-- /ko -->
<th class="align-right">
<td class="align-right">
<span data-bind="text:ownRevenue"></span>
</td>
<td class="align-right">
<span data-bind="text:totalEmployeeRevenues"></span>
</th>
<td class="align-right">
<span data-bind="text:budget"></span>
</td>
<td class="align-right">
<span data-bind="text:externCosts"></span>
</td>
<th class="align-right">
<span data-bind="text:budgetAvailable"></span>
</th>
<th class="align-right">
<span data-bind="text:saldo"></span>
<span data-bind="text:availableRevenue"></span>
</th>
<!-- <td class="align-right">-->
<!-- <span data-bind="text:externCosts"></span>-->
<!-- </td>-->
<!-- <th class="align-right">-->
<!-- <span data-bind="text:saldo"></span>-->
<!-- </th>-->
<th class="align-right">
<span data-bind="text:workInProgress"></span>
</th>
@@ -91,21 +91,21 @@
<span data-bind="text:totalRevenue"></span>
</th>
<!-- /ko -->
<th class="align-right">
<span data-bind="text:totalOwnRevenue"></span>
</th>
<th class="align-right">
<span data-bind="text:totalEmployeeRevenues"></span>
</th>
<th class="align-right">
<span data-bind="text:totalBudget"></span>
</th>
<th class="align-right">
<span data-bind="text:totalCosts"></span>
</th>
<th class="align-right">
<span data-bind="text:totalAvailableBudget"></span>
</th>
<th class="align-right">
<span data-bind="text:totalSaldo"></span>
<span data-bind="text:totalAvailableRevenues"></span>
</th>
<!-- <th class="align-right">-->
<!-- <span data-bind="text:totalCosts"></span>-->
<!-- </th>-->
<!-- <th class="align-right">-->
<!-- <span data-bind="text:totalSaldo"></span>-->
<!-- </th>-->
<th class="align-right">
<span data-bind="text:totalWorkInProgress"></span>
</th>