 Pau
|
ad38f50ae3
|
Merge branch '4457-hasInvoiceElectronic-para-cliente' of https://gitea.verdnatura.es/verdnatura/salix into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-23 08:55:46 +01:00 |
|
Pau
|
ade2e777d6
|
refs #4457 @30min requested changes
|
2022-11-23 08:55:44 +01:00 |
|
Pau
|
51d3091a40
|
Merge branch 'dev' into 4511-kkear-expedition.itemFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 13:45:03 +00:00 |
 Alex Moreno
|
660648e01f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
|
2022-11-22 14:35:25 +01:00 |
 Alexandre Riera
|
5552cd654e
|
Merge branch 'dev' into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 10:48:11 +00:00 |
|
Alexandre Riera
|
6656ea4f54
|
Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 10:20:42 +01:00 |
|
Alexandre Riera
|
2651081838
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 10:15:31 +01:00 |
|
Alexandre Riera
|
8e1505d5ee
|
Merge branch 'dev' into 3557-back-missingTrash
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 07:02:56 +00:00 |
|
Pau
|
cb6ae41c13
|
Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-21 13:45:28 +00:00 |
|
Pau
|
3003290e61
|
refs #4551 @20min requested changes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 14:38:51 +01:00 |
|
Alex Moreno
|
26be27c2ee
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-21 13:13:25 +01:00 |
|
Alexandre Riera
|
6ddd2d95a5
|
insert acl
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 11:48:18 +01:00 |
|
Alexandre Riera
|
4c21ffac3b
|
Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 11:44:53 +01:00 |
|
Alexandre Riera
|
463e56b631
|
corrections
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 11:41:17 +01:00 |
|
Alexandre Riera
|
40ea9805cf
|
fixes #4547 check compensation and tests
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 10:49:19 +01:00 |
|
Pau
|
cb0735d136
|
Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 08:34:18 +00:00 |
|
Alexandre Riera
|
fd58eaf838
|
drop procedure
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-18 09:36:38 +01:00 |
|
Alexandre Riera
|
566d384483
|
Merge branch '3557-back-missingTrash' of https://gitea.verdnatura.es/verdnatura/salix into 3557-back-missingTrash
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-16 13:46:20 +01:00 |
|
Alexandre Riera
|
e4a6585b6a
|
fix test back
|
2022-11-16 13:46:16 +01:00 |
|
Alexandre Riera
|
294f806bd9
|
Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-16 09:52:13 +01:00 |
|
Alexandre Riera
|
78dc7db7a7
|
correcciones
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-16 09:46:35 +01:00 |
|
Pau
|
7b3a1bfb22
|
requested changes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-16 08:28:12 +01:00 |
|
Alexandre Riera
|
7c8178b423
|
Merge branch 'dev' into 3557-back-missingTrash
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-16 07:07:20 +00:00 |
|
Pau
|
d7dc7c4329
|
Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-16 06:08:01 +00:00 |
|
Alexandre Riera
|
b7c9d6ea50
|
refs #3963 front and back tests fixed
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-15 15:30:00 +01:00 |
 Vicent Llopis
|
c200e1af32
|
refactor: optimizado select
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-15 15:09:41 +01:00 |
|
Pau
|
6e58b1de8b
|
refs #4511 Changed fixtures to fix broken test @30min
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-15 14:17:24 +01:00 |
|
Pau
|
56893ea58b
|
Merge branch 'dev' into 4511-kkear-expedition.itemFk
|
2022-11-15 13:42:06 +01:00 |
|
Alex Moreno
|
8dcd567a68
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-15 13:20:52 +01:00 |
|
Pau
|
2b3b2086d9
|
Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-15 09:39:03 +00:00 |
|
Pau
|
6339634756
|
refs #4457 move sql, remove await on front @2h
|
2022-11-15 10:37:12 +01:00 |
|
Alex Moreno
|
31eb2c86b5
|
Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-15 09:20:26 +00:00 |
|
Alex Moreno
|
72400ebf02
|
change folder db
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-15 09:37:14 +01:00 |
|
Alexandre Riera
|
5acbaf036a
|
refs #3557 back and test done
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-15 09:30:36 +01:00 |
|
Pau
|
9d0cd36afe
|
Merge branch 'dev' into 4457'
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-15 08:49:21 +01:00 |
|
Alex Moreno
|
bcab493f37
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
|
2022-11-15 07:33:53 +01:00 |
|
Pau
|
29b299f36a
|
Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-15 06:10:31 +00:00 |
|
Alexandre Riera
|
23ed6c6031
|
refs #3963 test front done
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-14 14:30:35 +01:00 |
|
Alexandre Riera
|
05f0eba741
|
Merge branch 'split-tour' into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-14 09:06:51 +01:00 |
|
Alexandre Riera
|
c16210dd8a
|
refs #4700 working on e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-11 15:58:11 +01:00 |
|
Vicent Llopis
|
7e50f23563
|
refacor code
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-11 08:55:56 +01:00 |
|
Vicent Llopis
|
a5b20bfb03
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
|
2022-11-11 08:53:10 +01:00 |
 Joan Sanchez
|
163f7fd284
|
Added version 10503
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-11 08:31:45 +01:00 |
|
Joan Sanchez
|
5e0a31f244
|
Merge pull request '3928-worker.time-control_sendMail' (!1129) from 3928-worker.time-control_sendMail into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1129
|
2022-11-11 07:30:01 +00:00 |
|
Vicent Llopis
|
9d06f5c0f0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-11 07:47:29 +01:00 |
|
Alexandre Riera
|
117e2c03f5
|
refs #4700 tests back y empezando e2e
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-10 15:54:00 +01:00 |
|
Alex Moreno
|
37d412bf3b
|
refactor: delete unnecessary test
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-10 14:38:37 +01:00 |
|
Joan Sanchez
|
6a2977a2cf
|
Fixed SQL changes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-10 14:19:20 +01:00 |
|
Alex Moreno
|
32701794bc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-10 13:34:43 +01:00 |
|
Alex Moreno
|
517422be8c
|
refactor: not use axios
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-10 13:32:07 +01:00 |
|
Pau
|
1327f0ae9d
|
Added requested changes, refs #4507 @1:20h
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-10 08:18:05 +01:00 |
|
Vicent Llopis
|
79e9edcee9
|
delete: old code
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-09 09:26:28 +01:00 |
|
Vicent Llopis
|
9bcfebcae6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-09 07:26:56 +01:00 |
|
Pau
|
2fc12dff52
|
#4457 @1h notifications working, need refactor ACL
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-08 13:59:00 +01:00 |
|
Pau
|
e85505ee8e
|
#4457 implement notification system, @1h 30m
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-08 12:26:01 +01:00 |
|
Pau
|
f45eaa07f9
|
refs #4511 fixed test, changed drop to rename @1h
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-08 09:45:56 +01:00 |
|
Pau
|
d1be14605b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4511-kkear-expedition.itemFk
|
2022-11-08 09:32:09 +01:00 |
|
Pau
|
78e6c8da15
|
Merge branch 'dev' into 4511-kkear-expedition.itemFk
|
2022-11-08 09:08:06 +01:00 |
|
Vicent Llopis
|
11459bbd56
|
refactor: change column name
|
2022-11-08 08:46:36 +01:00 |
|
Alexandre Riera
|
896a7eb6f0
|
refs #4700 arreglar filtro y traducciones
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-07 15:55:17 +01:00 |
|
Joan Sanchez
|
92a2367db2
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-07 10:52:53 +01:00 |
Joan
|
be1fbc4d68
|
Added version 10502
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-07 10:49:17 +01:00 |
|
Joan
|
17d6308126
|
Already on prod
|
2022-11-07 10:48:38 +01:00 |
|
Alex Moreno
|
c3ee9da6c6
|
hotFix: force apply changes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-07 10:18:32 +01:00 |
|
Alex Moreno
|
03ec8e27e6
|
feat(ticket_isEditable): use ticketWeekly
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-07 09:19:20 +01:00 |
|
Alex Moreno
|
5051f8b590
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
|
2022-11-07 07:24:44 +01:00 |
|
Joan Sanchez
|
1bcde47ab1
|
Merge pull request '3951-invoiceOut.index_downloadPdfs' (!1110) from 3951-invoiceOut.index_downloadPdfs into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1110
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-11-04 10:42:32 +00:00 |
|
Joan Sanchez
|
2afb47fe14
|
Added version 10501 - November
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-04 10:01:23 +01:00 |
|
Vicent Llopis
|
ae513fb2b3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-04 09:12:16 +01:00 |
|
Vicent Llopis
|
b6d3a08871
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3951-invoiceOut.index_downloadPdfs
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-03 10:17:46 +01:00 |
|
Alex Moreno
|
e6e8f15d64
|
Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-03 08:39:10 +00:00 |
|
Alex Moreno
|
67697784cd
|
Merge branch 'dev' into 4548-invoiceIn-pdf
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-03 06:48:38 +00:00 |
|
Vicent Llopis
|
35c50cb314
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3951-invoiceOut.index_downloadPdfs
|
2022-11-03 07:11:54 +01:00 |
|
Vicent Llopis
|
f96fc0f91e
|
Merge branch 'dev' into 3852-client.search-panel2
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-02 14:13:41 +00:00 |
|
Vicent Llopis
|
8c4e70c11d
|
Merge branch 'dev' into 3095-item.shelving
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-02 14:06:06 +00:00 |
|
Vicent Llopis
|
3cc89c170c
|
Merge branch 'dev' into 3811-ticket.sale_updatePrice
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-02 13:55:07 +00:00 |
|
Alex Moreno
|
943103c254
|
Merge branch 'dev' into 4548-invoiceIn-pdf
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-02 13:33:45 +00:00 |
|
Alex Moreno
|
c1ed0f2226
|
Merge branch 'dev' into changesInCorrectFolder
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-02 12:58:32 +00:00 |
|
Alex Moreno
|
2c3b735650
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf
|
2022-11-02 13:49:09 +01:00 |
|
Alex Moreno
|
6a9134d8f9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-02 13:48:36 +01:00 |
|
Alex Moreno
|
2a8a8ed84a
|
Merge branch 'dev' into 4146-claim_pickup_order
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-02 12:01:11 +00:00 |
|
Joan Sanchez
|
34997b72f5
|
Merge branch 'dev' into 3811-ticket.sale_updatePrice
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-02 11:55:47 +00:00 |
|
Joan Sanchez
|
e2101db706
|
Merge branch 'dev' into 4155-close_tickets_fix2
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-02 11:53:47 +00:00 |
|
Joan Sanchez
|
2fba17ab15
|
Merge branch 'dev' into 4548-invoiceIn-pdf
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-02 09:33:27 +00:00 |
|
Joan Sanchez
|
fe3ebe8e0c
|
Merge branch 'dev' into 3095-item.shelving
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-02 06:43:43 +00:00 |
|
Joan Sanchez
|
33c92a0f24
|
Merge pull request '4563-Worker-Description-workerDisableExcluded-checkbox' (!1076) from 4563-Worker-Description-workerDisableExcluded-checkbox into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1076
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-11-02 06:34:49 +00:00 |
|
Alex Moreno
|
a7b1ee85fe
|
fix changes folder
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-02 07:27:57 +01:00 |
|
Alex Moreno
|
b37c257885
|
feat(canEdit): use checkAccess
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-10-31 14:13:06 +01:00 |
|
Pau
|
0739608de3
|
Merge branch 'dev' into 4457-hasInvoiceElectronic
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-31 07:57:50 +01:00 |
|
Alex Moreno
|
445c6f1cc9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
|
2022-10-28 09:32:08 +02:00 |
|
Alex Moreno
|
e9731c4ac0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order
|
2022-10-28 09:11:40 +02:00 |
|
Vicent Llopis
|
264b56378a
|
Merge branch 'dev' into 4155-close_tickets_fix2
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-28 06:31:12 +00:00 |
|
Alex Moreno
|
9eb3b09be1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-28 08:26:45 +02:00 |
|
Alex Moreno
|
80617dd578
|
Merge branch 'dev' into 4320-notificationQueue
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-28 05:33:45 +00:00 |
|
Alex Moreno
|
9225e8f176
|
fix tests
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-27 15:11:57 +02:00 |
|
Vicent Llopis
|
fa89d1f944
|
fix: comentario corregido
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-26 13:10:50 +02:00 |
|
Vicent Llopis
|
65e32f5e7f
|
feat: client search panel add find by zone
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-26 12:40:13 +02:00 |
|
Vicent Llopis
|
350c516bb1
|
feat: cancelar petición cuando esta calculando el packaging
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-26 10:36:41 +02:00 |
|
Vicent Llopis
|
3110172c54
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3811-ticket.sale_updatePrice
|
2022-10-26 08:39:58 +02:00 |
|
Vicent Llopis
|
5e0f976ad2
|
Merge branch 'dev' into 4155-close_tickets_fix2
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-26 06:25:18 +00:00 |