Alex Moreno
|
77191b6182
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3372-ticket_sale
|
2021-12-01 11:29:10 +01:00 |
Carlos Jimenez Ruiz
|
23e55a1a82
|
Merge pull request 'Duplicated bank entity creation button on supplier account' (#814) from supplier_account into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #814
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2021-12-01 08:43:36 +00:00 |
Joan Sanchez
|
7acf7c5bea
|
Changed duplicated button...
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-01 08:29:05 +01:00 |
Vicent Llopis
|
b9893220cd
|
export database
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-01 08:19:28 +01:00 |
Alex Moreno
|
c7e5c25a28
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3372-ticket_sale
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 15:13:38 +01:00 |
Alex Moreno
|
decd4b5a95
|
separate sql procedures
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 15:13:20 +01:00 |
Carlos Jimenez Ruiz
|
cfdef6d090
|
Merge pull request 'feat(worker_calendar): add restrictions to add absence and to add hours recorded' (#812) from 3275-worker_calendar into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #812
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2021-11-30 13:14:20 +00:00 |
Vicent Llopis
|
238577ec8f
|
refactor: change ids by codes and add fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 13:57:17 +01:00 |
Alex Moreno
|
d5c0be5a9d
|
refactor(ticket_sale): logic and tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 13:47:16 +01:00 |
Carlos Jimenez Ruiz
|
d760eba446
|
Merge branch 'dev' into 3275-worker_calendar
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 11:40:54 +00:00 |
Vicent Llopis
|
21bd625b3b
|
add exceprion to half day absence
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 12:31:02 +01:00 |
Alex Moreno
|
85721dcf45
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3372-ticket_sale
|
2021-11-30 09:51:30 +01:00 |
Carlos Jimenez Ruiz
|
68a3a4d1e0
|
Merge pull request '2676-worker_time-control add timestamp url param' (#809) from 2676-worker_time-control into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #809
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2021-11-30 08:20:20 +00:00 |
Carlos Jimenez Ruiz
|
1176b23bb9
|
Merge branch 'dev' into 2676-worker_time-control
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 08:16:10 +00:00 |
Joan Sanchez
|
5c342ae463
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 09:11:40 +01:00 |
Vicent Llopis
|
4c064f8a80
|
feat(worker_calendar): add restrictions to add absence and to add hours recorded
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 09:11:23 +01:00 |
Joan Sanchez
|
495510efed
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 09:08:19 +01:00 |
Alex Moreno
|
594f258232
|
modify js date format
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 07:16:43 +01:00 |
Alex Moreno
|
85e3b47408
|
test(worker_time-control): tested url parameter timestamp
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-11-29 15:22:16 +01:00 |
Alex Moreno
|
07e092f9bd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2676-worker_time-control
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-29 11:52:43 +01:00 |
Carlos Jimenez Ruiz
|
df337360de
|
Merge pull request 'update column notificationEmail' (#810) from 3325-notify_absence into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #810
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2021-11-29 09:57:08 +00:00 |
Carlos Jimenez Ruiz
|
51a608cb5a
|
Merge branch 'dev' into 3325-notify_absence
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-29 09:49:58 +00:00 |
Carlos Jimenez Ruiz
|
a82053854a
|
Merge pull request 'feat(route_ticket): add column province and change order other columns' (#808) from 3387-route_ticket into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #808
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2021-11-29 09:49:42 +00:00 |
Joan Sanchez
|
f93da5f60d
|
Merge branch 'dev' into 3387-route_ticket
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-29 09:21:34 +00:00 |
Joan Sanchez
|
a19ce34aae
|
Merge pull request '3384-item_basic-data add field genericFk' (#807) from 3384-item_basic-data into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #807
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2021-11-29 09:21:12 +00:00 |
Alex Moreno
|
49e9fcaa7c
|
remove unnecesary on-accept
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-29 10:11:47 +01:00 |
Alex Moreno
|
8bd1db2e97
|
remove unnecesary on-accept
|
2021-11-29 10:10:53 +01:00 |
Alex Moreno
|
cff4c90651
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data
|
2021-11-29 10:10:04 +01:00 |
Alex Moreno
|
8ea3307230
|
feat(ticket_sale): allow multi-check for recalculatePrice
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-29 08:30:36 +01:00 |
Joan Sanchez
|
e4d7d957eb
|
Rectified icons
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 14:48:55 +01:00 |
Joan Sanchez
|
452d4557d1
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 14:11:33 +01:00 |
Joan Sanchez
|
9d6b870940
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 14:08:50 +01:00 |
Joan Sanchez
|
b0cb7e1424
|
Updated fonts
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 13:53:39 +01:00 |
Vicent Llopis
|
2f7295020c
|
update column notificationEmail
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 13:30:40 +01:00 |
Vicent Llopis
|
442bf1940e
|
delete last commit, uploaed by error
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 13:28:12 +01:00 |
Alex Moreno
|
65053f5f28
|
feat(worker_time-control): add timestamp url param
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 13:26:48 +01:00 |
Vicent Llopis
|
d1add9ef84
|
sql changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 13:16:44 +01:00 |
Joan Sanchez
|
bcca33bc33
|
Updated icons
|
2021-11-26 13:04:07 +01:00 |
Vicent Llopis
|
e13f2d4ae3
|
feat(route_ticket): add column province and change order other columns
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 10:06:13 +01:00 |
Joan Sanchez
|
c986fe9557
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 09:59:21 +01:00 |
Joan Sanchez
|
eb101ffc76
|
refactor(fonts): updated fonts and changed invoiceOut icon
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 09:59:05 +01:00 |
Joan Sanchez
|
25371ef97b
|
Translation fix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 09:06:58 +01:00 |
Alex Moreno
|
771100ccab
|
remove unnecessary intro and comment
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 08:40:20 +01:00 |
Alex Moreno
|
2ab5c9818a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 08:35:00 +01:00 |
Alex Moreno
|
eea9413628
|
fix(item_basic-data): controller, test e2e and model
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 08:34:32 +01:00 |
Carlos Jimenez Ruiz
|
9f8d2c7350
|
Merge pull request '3377-modifyStyles' (#798) from 3377-modifyStyles into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #798
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2021-11-25 15:21:12 +00:00 |
Carlos Jimenez Ruiz
|
ba29df16c0
|
Merge branch 'dev' into 3377-modifyStyles
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-25 15:02:47 +00:00 |
Vicent Llopis
|
74fbae6510
|
refactor(route_ticket): add style in a style.scss
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-25 15:15:51 +01:00 |
Joan Sanchez
|
6b6a1b4329
|
refactor(fonts): updated fonts and changed invoiceOut icon
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-25 14:14:01 +01:00 |
Vicent Llopis
|
6afc694f6c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3377-modifyStyles
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-25 14:07:14 +01:00 |