Commit Graph

100 Commits

Author SHA1 Message Date
Javi Gallego 3e71338d94 borra tabla temporal
gitea/salix/dev This commit looks good Details
2019-10-10 12:14:21 +02:00
Joan Sanchez 4025c624b3 #15 WIP fixed requested changes
gitea/salix/1625-worker_department_treeview This commit looks good Details
2019-10-08 12:48:12 +02:00
Joan Sanchez 9919f9a46e add & remove childs
gitea/salix/1625-worker_department_treeview This commit looks good Details
2019-10-04 07:41:24 +02:00
Joan Sanchez 183d770483 first changes
gitea/salix/1625-worker_department_treeview This commit looks good Details
2019-10-01 15:09:55 +02:00
Bernat 15097313a2 #1651 worker.json
gitea/salix/dev This commit looks good Details
2019-08-27 11:12:17 +02:00
Bernat 098dd7b235 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-07-31 10:45:03 +02:00
Joan Sanchez eccf381e56 contabilize worker.calenday holidays, updated styles
gitea/salix/dev This commit has test failures Details
2019-07-31 09:50:47 +02:00
Bernat 116a34d04a fix test 2019-07-31 09:17:26 +02:00
Bernat dd38a21e8d Refactor #1569 claim.delete, update fixtures and fix test
gitea/salix/dev This commit looks good Details
2019-07-01 11:56:16 +02:00
Bernat e945967762 Refactor #1563 fixtures item,sale,saleComponent
gitea/salix/dev This commit looks good Details
2019-06-27 09:03:03 +02:00
Bernat 682a75ac76 #1533 update fixtures and fix test
gitea/salix/dev This commit looks good Details
2019-06-25 14:00:55 +02:00
Joan Sanchez 340e7b8495 round worker calendar holidays #1547
gitea/salix/dev This commit has test failures Details
2019-06-21 09:56:39 +02:00
Carlos Jimenez Ruiz fcc0ad6098 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-06-14 12:27:54 +02:00
Carlos Jimenez Ruiz b8a4861f01 #1526 refactor fixtures 2019-06-14 12:27:41 +02:00
Joan Sanchez a9aaa3329a fixed worker calendar
gitea/salix/dev This commit looks good Details
2019-06-14 08:17:12 +02:00
Bernat 5ce33fbefd Bug/Test #1515 Dump structure de production a dev 2019-06-11 12:25:02 +02:00
Joan Sanchez 43e87a1cb1 mege from test to dev - no structure
gitea/salix/dev This commit looks good Details
2019-06-07 13:07:23 +02:00
Joan Sanchez 4545d1f649 merge from test to dev - no structure 2019-06-07 13:06:54 +02:00
quique a6a6ea5b06 WorkerTimerControl App
gitea/salix/test This commit looks good Details
2019-06-03 09:41:54 +02:00
quique b034333cdb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-06-03 09:20:35 +02:00
quique 8005b0a892 WorkerTimeControl App 2019-06-03 09:20:20 +02:00
Bernat 62fe9d760c #1488 #1489 ticket sale updatePrice and backTest
gitea/salix/dev This commit looks good Details
2019-06-03 08:01:24 +02:00
Bernat 97459bd7e6 1497
gitea/salix/test This commit looks good Details
2019-05-31 11:33:28 +02:00
Joan Sanchez f73b42b0be accessType refactor #1460
gitea/salix/dev This commit looks good Details
2019-05-22 12:35:24 +02:00
Joan Sanchez 183bf137f6 added workerTimeControl #1360
gitea/salix/dev This commit has test failures Details
2019-05-17 13:27:51 +02:00
Joan Sanchez 69403223d8 fixed treeview #1374
gitea/salix/dev This commit looks good Details
2019-04-29 11:49:43 +02:00
Carlos Jimenez Ruiz 8d5cc93ddb #1359 refactor absences 2019-04-23 13:29:52 +02:00
Bernat 9a86929e3a #1344 create test for worker filter
gitea/salix/dev This commit looks good Details
2019-04-16 13:10:06 +02:00
Bernat c2b3ff8d81 #1335 worker/filter renamed columns acordantly 2019-04-16 08:42:44 +02:00
Bernat 0d680bdaed #1343 update worker filter 2019-04-16 07:59:29 +02:00
Joan Sanchez 9ce1e93da7 changed worker holidays length 2019-04-09 13:38:02 +02:00
Joan Sanchez afafbdda95 fixed back unit test
gitea/salix/dev This commit looks good Details
2019-04-03 14:04:25 +02:00
Joan Sanchez e433828f7c Merge branch 'master' into dev
gitea/salix/dev There was a failure building this commit Details
2019-04-03 11:55:18 +02:00
Joan Sanchez 892e267a16 fixed worker calendar total holidays #1299
gitea/salix/master This commit looks good Details
2019-04-03 11:36:10 +02:00
Joan Sanchez 6d51ef4187 fixed absence test
gitea/salix/dev This commit looks good Details
2019-04-01 08:56:18 +02:00
Bernat 4e1e3bdeeb cau 10270 refactor fixtures and fix test
gitea/salix/dev This commit looks good Details
2019-03-26 10:25:11 +01:00
Joan Sanchez c5e953f922 worker calendar front & back unit tests #1248
gitea/salix/dev This commit looks good Details
2019-03-22 12:51:44 +01:00
Joan Sanchez 6eaf317b5e added worker calendar #1147
gitea/salix/dev This commit looks good Details
2019-03-22 08:28:57 +01:00
Carlos Jimenez Ruiz d7d8bff92b #1196 worker.descriptor correo 2019-03-15 12:58:26 +01:00
Gerard 5fcb9f61ab Merge branch 'master' into test
gitea/salix/test This commit looks good Details
2019-03-13 16:09:14 +01:00
Gerard 0a95f1b299 #1229 general search of worker searckpanel now searchs users
gitea/salix/master This commit looks good Details
2019-03-13 16:08:04 +01:00
Joan Sanchez 92170c34d5 worker department #1133
gitea/salix/dev This commit has test failures Details
2019-03-12 15:04:09 +01:00
Gerard f6eb8315a3 #999 worker.index buscador
gitea/salix/test This commit looks good Details
2019-03-11 08:00:49 +01:00
Carlos Jimenez Ruiz 1e89b6977a #1070 Renombrar columnas de la vista vn.worker
gitea/salix/dev This commit looks good Details
2019-02-27 13:10:26 +01:00
Juan Ferrer e63e4319cd Worker module fixes 2019-02-01 09:31:01 +01:00
Bernat 19cfa1ab75 upadte structure db and models 2019-01-31 09:12:29 +01:00
Juan Ferrer 7893c784aa #997 worker summary 2019-01-29 21:45:43 +01:00
Juan Ferrer e553d63492 #996 worker.descriptor 2019-01-29 21:00:27 +01:00
Juan Ferrer f47fe9c1cc #998 worker.index, back tests fixed 2019-01-29 16:37:59 +01:00
Juan Ferrer 3e40c651af #998 worker.index 2019-01-28 16:24:45 +01:00