Commit Graph
100 Commits
Author SHA1 Message Date
theo 10d991f4c7 Diversen dashboard 2020-01-31 15:56:51 +01:00
theo 63ac729032 kopje verstuurde facturen 2020-01-17 13:29:01 +01:00
theo fa58fa5b71 dashboard 2020-01-17 13:19:00 +01:00
theo 20fc96a8fd diversen dashboard 2020-01-17 12:04:29 +01:00
theo 69766f7a63 hide dashboard for other then Peter 2020-01-10 17:58:56 +01:00
theo 090cc90de1 Merge branch 'master' into feature/dashboard
# Conflicts:
#	application/models/eloquent/Projectemployee.php
2020-01-10 17:43:05 +01:00
theo 5594865554 Invoiced report 2020-01-10 17:42:25 +01:00
theo 1295814ff4 diversen dashboard 2020-01-10 15:30:30 +01:00
theo b4d69d272c fix for timing in employeehours 2019-12-06 10:58:07 +01:00
theo 6696189d33 kg 2019-12-06 10:46:40 +01:00
theo f185d467fb dashboard 2019-11-13 08:09:28 +01:00
theo 17b50c9906 Merge conflict 2019-10-31 14:19:23 +01:00
theo 5948892b93 merge 2019-10-31 14:14:50 +01:00
theo e0029b3d53 Merge branch 'master' of bitbucket.org:pensare/dbois
# Conflicts:
#	application/views/modals/partials/_reservations.php
#	application/views/pages/reservations_view.php
2019-10-31 14:04:47 +01:00
theo 776731e5b1 fix for hours o filter in OHWP 2019-10-30 15:25:54 +01:00
theo 0f5261319f fix voor tonen / verbergen compctsop blokjes 2019-10-27 11:21:43 +01:00
theo 7345f3ca1f conflicts 2019-10-25 16:52:12 +02:00
theo d0069061ba Diverse wijzigingen nav word document 2019-10-25 16:47:46 +02:00
theo 92a460f0ff reservations sdjusted 2019-10-07 19:45:42 +02:00
theo 6f21ab10de fix fopr offer total 2019-09-18 09:40:10 +02:00
theo 281b9ac0f3 fix 2019-09-13 17:09:08 +02:00
theo f1c5f3e8dc version 2019-09-13 16:22:36 +02:00
theo a3291f26e3 fix for employeehours 2019-09-13 16:22:05 +02:00
theo b49fb957a3 Diversen opmerkingen Peter (23-08-2019) 2019-09-12 20:16:57 +02:00
theo f5b815d34d Add frontpage trainiings rows 2019-08-30 13:41:06 +02:00
theo b3e8eecca6 change password 2019-05-07 21:41:49 +02:00
theo 2738f8aa78 nieuwe kolommen bij offertes / employeehours reportable 2019-05-07 21:20:35 +02:00
theo ddea739199 invoice added new columns 2019-04-30 19:07:18 +02:00
theo ecb2d3437c fix for reportable 2019-04-15 14:34:46 +02:00
theo d3dd500248 visibility offres at timewriting 2019-04-15 14:26:05 +02:00
theo 0a891af5ec fix for employeehours (remove) and refresh active offers / projects 2019-04-13 10:39:58 +02:00
theo a71a7096d6 fix 2 2019-03-01 15:49:43 +01:00
theo a65d0b7deb fix for urenreport 2019-03-01 15:15:43 +01:00
theo 0ee4785a40 fix for excelreport 2019-02-26 16:04:55 +01:00
theo e8004d6e0a version at all js 2019-02-26 08:51:41 +01:00
theo 695f6c6960 Diverse aanpassing nav mail Peter 2019-02-22 14:19:03 +01:00
theo d71692f320 style 2019-01-02 17:35:02 +01:00
theo d8601aaed6 uppercase 1 2019-01-02 17:31:07 +01:00
theo 2274d665c8 backup onder beheer 2019-01-02 17:28:07 +01:00
theo efcd9f2c09 Wijzigingen nav opmerking Peter 24-12-2018 2019-01-02 16:57:41 +01:00
theo 9569522c83 Uppercase II 2018-08-05 11:03:58 +02:00
theo f5e7d4f4db Uppercase vatcontroller 2018-08-05 11:03:09 +02:00
theo 8f5db8e580 uppercase 2018-08-05 11:00:02 +02:00
theo b0a866ba11 Diversen nav mail Peter 2018-08-05 10:48:53 +02:00
theo 16616f13d2 debug 9 2018-07-31 16:08:53 +02:00
theo 154d793ca5 debug 8 2018-07-31 15:55:44 +02:00
theo 26f16ee088 Diversen debug 2018-07-31 15:15:54 +02:00
theo c520c3386a Debug 6 /reservation 2018-07-31 13:47:47 +02:00
theo 2da7fdd9cc debug 5 2018-07-30 16:59:09 +02:00
theo 7121f898b6 Debug 4 2018-07-30 16:11:44 +02:00
theo a57fc08400 Debbug uppercase 2018-07-30 15:23:55 +02:00
theo 8e31d7f395 contractors removed from invoice 2018-07-30 15:09:11 +02:00
theo a55609a19a debug 2 2018-07-30 14:53:18 +02:00
theo 6db58e9dc6 dbug 1 2018-07-30 14:50:52 +02:00
theo e16ed4f780 Version for login 2018-07-30 14:44:27 +02:00
theo 619fff40a7 Diversen opmerkingen 2018-07-30 14:38:38 +02:00
theo 708a22f734 Offrte gours 2018-07-30 10:45:53 +02:00
theo b86c3fc4b9 Spreadsheet 2018-07-29 21:26:49 +02:00
theo 30535f7048 diversen opmerkingen 2018-07-29 10:11:02 +02:00
theo cecbfd83fb diuversen opmerkingen 19062018 2018-07-14 16:56:42 +02:00
theo 124be78a85 verwerken diverse opmerkingen 2018-06-19 09:51:05 +02:00
theo a13418c9c7 Fix for projects table 2018-06-11 09:40:31 +02:00
theo 4954d6fcca Fix 2018-06-11 08:17:01 +02:00
theo c539d03fb6 Removalls and offers revenues 2018-06-10 17:31:05 +02:00
theo 8fe98e6ccb fix2 2018-05-27 16:04:29 +02:00
theo 3e22cdb270 fix 2018-05-27 16:01:32 +02:00
theo c7846f9a80 Diversen nav opmerkingen 2018-05-06 20:39:59 +02:00
theo a3d200c38b Diversen nav opmerkingen 2018-05-05 20:55:18 +02:00
theo b589058437 Diverse wijzigingen 2018-05-05 13:22:14 +02:00
theo 860c5db95a Diversen nav opmerkingen 2018-05-03 19:54:32 +02:00
theo 6bc0b37f06 diversen 2018-04-24 08:31:00 +02:00
theo e49fa05a9a diversen opmerkingen 2018-04-21 21:12:09 +02:00
theo 9187742658 diversen nav opmerkingen 2018-04-21 16:51:01 +02:00
theo 8e3649768b CSS opruiming 2018-04-21 11:10:55 +02:00
theo 7c76a668dc klein grut 2018-04-20 07:17:25 +02:00
theo 08e51ef303 projectPage 2018-04-13 17:48:11 +02:00
theo dbe736d941 Reservations 2018-04-13 17:05:13 +02:00
theo 49bd541cb8 upload 2018-04-06 10:48:39 +02:00
theo 6f6cda4125 fix 2018-04-05 21:21:08 +02:00
theo cc06950e03 aanpassen styling voor side menu 2018-04-05 21:17:07 +02:00
theo 858cb89d05 fix for uppercase 2018-04-02 17:46:24 +02:00
theo 2f3b1439e8 Merge branch 'master' of bitbucket.org:pensare/dbois
# Conflicts:
#	application/controllers/projects/EmployeeHoursController.php
#	application/views/pages/employeehours_view.php
#	public/js/lib/modules/projects/employeehoursModule.js
2018-04-02 17:34:19 +02:00
theo 1b0ad5de83 diversen opmerkingen Peter 2018-04-02 17:32:20 +02:00
theo 6170bb6f08 fix 2018-03-21 17:38:10 +01:00
theo e89dc41e18 diversen nav opmerkingen 2018-03-21 17:23:58 +01:00
theo 0fd25f359b commen hours 2018-03-21 11:07:32 +01:00
theo 3241cc0c67 Fix for double controller name 2018-03-07 19:45:31 +01:00
theo f50dbcabe2 Ucase 2018-03-07 17:19:20 +01:00
theo 49f4943ca8 Merge branch 'master' of bitbucket.org:pensare/dbois 2018-03-07 17:03:52 +01:00
theo ad478b02b1 Invoice report 2018-03-07 17:03:45 +01:00
theo f8917fb0fd Merge branch 'master' of https://bitbucket.org/pensare/dbois
# Conflicts:
#	application/views/main_view.php
2018-03-05 13:38:35 +01:00
theo ca40c8f45b small fix 2018-03-05 13:37:22 +01:00
theo f540bab261 invoice report 2018-03-02 17:06:41 +01:00
theo fad71498dd fix 2018-03-01 19:17:18 +01:00
theo 7b77af4362 fix ucase 2018-03-01 19:15:13 +01:00
theo 237a60d7f2 Fix ucase 2018-03-01 19:12:24 +01:00
theo f7729c055e fix 2018-03-01 19:08:34 +01:00
theo 738ad80c49 Employee hours 2018-03-01 19:01:53 +01:00
theo 50cd8d8f08 Monthly hours and revenues per employee report 2018-03-01 10:43:58 +01:00
theo f52b3539ba fix for extra column 2018-02-21 21:38:14 +01:00