Pau
|
f652e86c78
|
Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-19 07:47:08 +01:00 |
Alexandre Riera
|
45b02c3bc6
|
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-12-16 13:45:25 +01:00 |
Alex Moreno
|
0a18c855e7
|
Merge branch 'dev' into 4928-supplier-payMethod-notify
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-16 10:43:40 +00:00 |
Vicent Llopis
|
3642b295b7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification
|
2022-12-16 08:50:51 +01:00 |
Joan Sanchez
|
dac6b4cb22
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-16 08:41:43 +01:00 |
Joan Sanchez
|
5b23ee6d5a
|
Removed deprecated fields
|
2022-12-16 08:10:39 +01:00 |
Vicent Llopis
|
1b30ee9d2d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-15 14:32:51 +01:00 |
Alexandre Riera
|
45317c0850
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-15 14:26:10 +01:00 |
Alexandre Riera
|
0af4f337e4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-15 14:23:44 +01:00 |
Alexandre Riera
|
522000cd04
|
refs #4928 fix fixtures
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-15 09:52:34 +01:00 |
Alexandre Riera
|
72c27f7176
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-13 12:37:56 +01:00 |
Alex Moreno
|
09edb99a1b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
|
2022-12-12 13:48:06 +01:00 |
Alex Moreno
|
4cb8d8c763
|
test: enable one test and skip another
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-12 13:11:45 +01:00 |
Alexandre Riera
|
569a0e8cc9
|
refs #3302 log modified and fixed e2e tests
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-05 15:30:41 +01:00 |
Pau
|
5235ed5499
|
Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-02 08:05:04 +00:00 |
Vicent Llopis
|
ba8fe7dfa8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-01 07:11:00 +01:00 |
Alex Moreno
|
8df7b91127
|
fix: entry ref
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-30 15:24:33 +01:00 |
Vicent Llopis
|
68855add59
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-30 10:53:54 +01:00 |
Alex Moreno
|
67cf4ebbea
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db
|
2022-11-30 10:28:21 +01:00 |
Vicent Llopis
|
5c1b88fa44
|
detele: fixtures en español
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-30 08:21:53 +01:00 |
Vicent Llopis
|
f056c26b0d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification
|
2022-11-30 08:03:16 +01:00 |
Vicent Llopis
|
c258587e02
|
feat: plantilla email para asientos contables importados incorrectamente
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-29 15:06:21 +01:00 |
Alexandre Riera
|
acbd0474a5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-29 08:50:48 +01:00 |
Carlos Andrés
|
8a0c810a84
|
refs #4613
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-28 17:45:19 +01:00 |
Alex Moreno
|
7f1478f2e9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-28 14:48:37 +01:00 |
Alex Moreno
|
da2d1df522
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4613-Eliminar-cálculo-portfolio
|
2022-11-28 10:14:16 +01:00 |
Alex Moreno
|
6db1a9e8ae
|
refs #4859 fix: fixtures db exportation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-28 07:19:30 +01:00 |
Vicent Llopis
|
7f3265be55
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel
|
2022-11-25 12:24:00 +01:00 |
Alexandre Riera
|
8fec0670ea
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
|
2022-11-25 10:25:46 +01:00 |
Carlos Andrés
|
8d2e532167
|
#4613 eliminar uso de portfolio
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-25 09:32:54 +01:00 |
Vicent Llopis
|
d023ec0a13
|
update fixtures
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-25 08:24:25 +01:00 |
Vicent Llopis
|
dbbce77cc8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-25 07:41:43 +01:00 |
Pau
|
02f2724f2b
|
Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-25 06:35:15 +00:00 |
Vicent Llopis
|
84c6604dd9
|
feat: enviar sms con cambios en el pedido
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-24 15:04:15 +01:00 |
Vicent Llopis
|
927b5a63ec
|
Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-24 09:14:01 +00:00 |
Alexandre Riera
|
32e4a7273c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-24 09:59:59 +01:00 |
Alexandre Riera
|
5124b3b681
|
Merge branch 'dev' into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-24 08:42:09 +00:00 |
Vicent Llopis
|
7ccf37c079
|
Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-24 08:08:56 +00:00 |
Vicent Llopis
|
6f2a7a5cef
|
feat: enviar sms con cambios en las líneas
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-23 15:15:40 +01:00 |
Alex Moreno
|
cbdffc98a4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
|
2022-11-23 14:16:42 +01:00 |
Vicent Llopis
|
f313a53cde
|
refactor: cambiadas fixtures, backTest y traducciones
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-23 10:56:55 +01:00 |
Vicent Llopis
|
6a2af344aa
|
feat: antes de bloquear comprobar que no existe un bloqueo previo
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-23 10:41:32 +01:00 |
Vicent Llopis
|
9cfab2b3f4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
|
2022-11-23 10:23:17 +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 |
Vicent Llopis
|
32f28e91b5
|
feat: sistema de bloque para ficheros mdb
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-22 14:29:42 +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 |
Vicent Llopis
|
8876bc2b68
|
Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-22 08:12:07 +00: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
|
d41269bbbe
|
Change fixtures so the provider is present in the label
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-18 11:58:46 +01:00 |
Alexandre Riera
|
a952fc0330
|
space fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-18 09:38:22 +01:00 |
Alexandre Riera
|
67f0346980
|
space fixtures
gitea/salix/pipeline/head Build queued...
Details
|
2022-11-18 09:37:38 +01: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
|
153cb48ff0
|
fix test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-17 08:55:35 +01: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 |
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
|
cba3c38ba6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
|
2022-11-15 12:55:07 +01:00 |
Vicent Llopis
|
fc516d4029
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-15 12:23:59 +01:00 |
Vicent Llopis
|
843e5ae736
|
feat: traducciones en los modelos
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-15 11:41:57 +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
|
8f4ac8fcc9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
|
2022-11-15 10:12:29 +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 |
Alex Moreno
|
db3a6df23d
|
feat(worker): new worker
|
2022-11-14 15:19:16 +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 |
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
|
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 |
Vicent Llopis
|
918ea3030d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-10 14:41:12 +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 |
Alexandre Riera
|
ff00066138
|
refs #4700 tests front y fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-08 15:56:58 +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
|
0da6bd44e7
|
Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-08 07:06:27 +00:00 |
Pau
|
2df195764d
|
Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-08 08:05:13 +01:00 |
Vicent Llopis
|
51b047eacc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-08 07:40:31 +01:00 |
Vicent Llopis
|
ffa0ff650e
|
feat: add time control
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-07 12:21:14 +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 |
Vicent Llopis
|
98cc2b5866
|
refactor: endpoint
|
2022-11-04 13:41:38 +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 |
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 |
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
|
04f165d901
|
solved conflits
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-02 14:23:35 +01:00 |
Vicent Llopis
|
6df74facdc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
|
2022-11-02 14:23:20 +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
|
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 |
Alex Moreno
|
fc7a39e910
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-02 07:33:07 +01:00 |
Vicent Llopis
|
d9107719fa
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
|
2022-10-31 15:04:33 +01:00 |
Alex Moreno
|
36c0cc1a38
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
|
2022-10-31 14:12:40 +01:00 |
Joan Sanchez
|
231575d23e
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-31 12:40:07 +01:00 |
Joan Sanchez
|
d34936015b
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-31 12:39:54 +01:00 |
Vicent Llopis
|
838402f05a
|
add fixtures
|
2022-10-31 09:55:05 +01:00 |
Vicent Llopis
|
786ba0d614
|
feat: inserta fichadas de los teletrabajadores
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-31 07:34:34 +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 |
Alex Moreno
|
926ab0e35c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order
|
2022-10-27 09:05:05 +02:00 |
Alex Moreno
|
99fca9834f
|
Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-27 06:10:14 +00:00 |
Vicent Llopis
|
1d908002e2
|
feat: add backTest
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-26 14:25:27 +02:00 |
Alex Moreno
|
f65d06fc7d
|
fixes #4073
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-26 08:27:28 +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 |
Alex Moreno
|
607e9010e6
|
Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 12:36:35 +00:00 |
Joan Sanchez
|
4334907d91
|
fix(database): updated sql files
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-25 14:09:21 +02:00 |
Vicent Llopis
|
6f7ec12cb2
|
feat: response as 'reply' and not as 'internNote'
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-19 10:35:41 +02:00 |
Pau
|
8b07180890
|
Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-18 11:56:56 +00:00 |
Alex Moreno
|
0bc018ec02
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-17 14:06:31 +02:00 |
Alex Moreno
|
991893837c
|
correct fixutures from dev
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-17 07:34:22 +02:00 |
Alex Moreno
|
2b060a1437
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-17 07:32:32 +02:00 |
Alex Moreno
|
c637f2c879
|
feat(send): use vn-print libary and adapt test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-14 13:22:53 +02:00 |
Alex Moreno
|
c2d37dadf7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4320-notificationQueue
|
2022-10-14 08:01:06 +02:00 |
Alex Moreno
|
376d46b67e
|
feat(canEdit): integrate isWeekly and adapt back tests and e2e
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-10 13:06:49 +02:00 |
Vicent Llopis
|
2e91698c1e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-07 08:19:08 +02:00 |
Alex Moreno
|
e7bafb1386
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-07 07:47:46 +02:00 |
Alex Moreno
|
c29625f079
|
fix: funcionalityAcl
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-10-06 15:04:27 +02:00 |
Joan Sanchez
|
8ccb47d741
|
Merge pull request '4073-feat(user): add section privileges and remove changeRole in descriptor' (#1073) from 4073-user_privileges into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1073
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-10-06 11:54:16 +00:00 |
Javi Gallego
|
d73dab3454
|
Merge branch 'dev' into 4090-global_invoincing
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-06 13:01:56 +02:00 |
Alex Moreno
|
9d482f7dfd
|
test(ticket): fix tests and add funcionalityAcl
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-10-05 15:13:36 +02:00 |
Alex Moreno
|
8b636497a4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2022-10-05 13:47:25 +02:00 |
Alex Moreno
|
fe8ae164eb
|
refactor(ticket): isEditable, canEdit
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-04 13:22:11 +02:00 |
Pau
|
3caf89bddb
|
refactor: Replaced isBox with freightItemFk
|
2022-10-04 09:27:31 +02:00 |
Alex Moreno
|
7a690dd880
|
feat(user): add section privileges and remove changeRole in descriptor
gitea/salix/pipeline/head This commit looks good
Details
test(user):back and e2e
|
2022-10-03 15:11:29 +02:00 |
Alex Moreno
|
f81b2775a0
|
add fixture
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-30 09:36:51 +02:00 |
Joan Sanchez
|
1ac35c0b68
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-29 14:52:31 +02:00 |
Joan Sanchez
|
5aec280adb
|
Closure migration
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-29 09:07:18 +02:00 |
Alex Moreno
|
203b223cc6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-28 12:24:40 +02:00 |
Joan Sanchez
|
660842ca31
|
Osticket & waste refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-27 14:20:57 +02:00 |
Pau
|
2dd6de1d47
|
Modified Fixtures, clone.js and the item model
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-27 13:46:23 +02:00 |
Joan Sanchez
|
7f78286d6b
|
Reports refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-26 13:33:27 +02:00 |
Alex Moreno
|
f698a22fcf
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-26 09:25:43 +02:00 |
Joan Sanchez
|
68f3544477
|
Claim pickup order
|
2022-09-22 09:17:14 +02:00 |
Joan Sanchez
|
5d6459d565
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-21 08:37:20 +02:00 |
Alex Moreno
|
b3aaa493d5
|
fix(): fix fixtures and all code needed for change the structure
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-19 09:45:28 +02:00 |
Vicent Llopis
|
1fd97f167c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-13 11:35:15 +02:00 |
Alex Moreno
|
4a058faaf8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
|
2022-09-05 08:12:07 +02:00 |
Joan Sanchez
|
768e4d5e77
|
Resolved conflicts
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-10 12:13:31 +02:00 |
Vicent Llopis
|
31aafc0719
|
feat: add inserts in printQueue
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-10 09:11:38 +02:00 |
Alex Moreno
|
062806b3f0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-05 13:19:43 +02:00 |
Joan Sanchez
|
cabc30ef87
|
Merge pull request '3069-client.shelving' (#1029) from 3069-client.shelving into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1029
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-08-05 09:18:53 +00:00 |
Joan Sanchez
|
624428212b
|
Merge pull request '4299-travel.agencyModeFk' (#1026) from 4299-travel.agencyModeFk into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1026
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2022-08-04 12:51:41 +00:00 |
Vicent Llopis
|
c3d396b042
|
fix: test e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-04 13:52:59 +02:00 |
Vicent Llopis
|
020990dadc
|
fix: backTest
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-08-04 09:53:22 +02:00 |
Vicent Llopis
|
998176f03c
|
fix: fixtures
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-08-04 08:23:39 +02:00 |
Vicent Llopis
|
82f2ef768f
|
fix: fixtures
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-08-04 08:15:20 +02:00 |
Vicent Llopis
|
ede6da1a15
|
fix: db fixtures
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-08-03 15:14:02 +02:00 |
Joan Sanchez
|
1b9de5cc95
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4270-route.create
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-03 08:44:43 +02:00 |
Joan Sanchez
|
185ce60bef
|
Merge pull request '1781-zoneHoliday' (#994) from 1781-zoneHoliday into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #994
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2022-08-03 06:41:22 +00:00 |
Alex Moreno
|
8a08b6f399
|
feat(ticket_boxing): return video stream
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-02 15:15:05 +02:00 |
Carlos Andrés
|
918a09ad5c
|
#3530 Eliminar uso tabla person
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-07-29 15:17:00 +02:00 |
Vicent Llopis
|
537c383cd2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-29 13:38:23 +02:00 |
Joan Sanchez
|
468da0c5a9
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-07-27 08:12:06 +02:00 |
Alex Moreno
|
3fd34e0861
|
feat(claim_pickup_order): modify email
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-07-25 14:49:39 +02:00 |
Alex Moreno
|
8048d4ce90
|
feat(notification): basic functionality and test
|
2022-07-25 08:25:10 +02:00 |
Carlos Jimenez Ruiz
|
f3766edbb7
|
Merge branch 'dev' into 1781-zoneHoliday
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-07-22 13:56:19 +00:00 |
Alex Moreno
|
9b48cbb078
|
feat(notification): send
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-20 14:54:50 +02:00 |
Alex Moreno
|
7895decf4e
|
feat(notification): create models
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-07-19 15:17:22 +02:00 |
Vicent Llopis
|
b4408dc080
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4270-route.create
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-19 14:42:43 +02:00 |
Vicent Llopis
|
762ec3045f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3069-client.shelving
|
2022-07-14 09:11:43 +02:00 |
Vicent Llopis
|
fdf6e04233
|
change travel.agencyFk by agencyModeFk
|
2022-07-13 14:36:03 +02:00 |
Vicent Llopis
|
7bf9a8c100
|
delete itemType.warehouseFk
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-07-12 11:52:47 +02:00 |
Alex Moreno
|
051a849a21
|
fix(zone): fix getEventsFiltered
gitea/salix/pipeline/head This commit looks good
Details
|
2022-07-12 08:10:29 +02:00 |
Vicent Llopis
|
1eb6ee69cc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-07-12 08:09:02 +02:00 |
Vicent Llopis
|
189d0a27bc
|
refactor: delete unnecessary sql
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-07-05 11:44:03 +02:00 |
Vicent Llopis
|
5f2f5b9b25
|
feat: add sql changes
|
2022-07-05 10:18:26 +02:00 |
Carlos Jimenez Ruiz
|
d0e06a46d0
|
removed deprecated stowaway comp and usages
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-07-01 09:15:07 +02:00 |
Alex Moreno
|
ca767b84f0
|
fix(entry): change isInventory to isExcludedFromAvailable
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-30 13:21:07 +02:00 |
Alex Moreno
|
22fd0e91b0
|
title translations, and getWorkedHours test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-28 12:10:37 +02:00 |
Alex Moreno
|
a3f1c36226
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests
|
2022-06-28 11:12:06 +02:00 |
Carlos Jimenez Ruiz
|
bdf4ecdf50
|
Merge branch 'dev' into 4223-claim_observations
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-28 07:03:44 +00:00 |
Alex Moreno
|
8e2ed4e182
|
fix(worker_getWorkedHours): fix fixtures and test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-06-27 15:09:43 +02:00 |
Alex Moreno
|
0197f08c48
|
typo
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-06-27 14:13:50 +02:00 |
Alex Moreno
|
7980a941a9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-06-27 14:03:24 +02:00 |
Alex Moreno
|
212c351064
|
fix(item_create): fixtures and test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-27 13:17:22 +02:00 |
Carlos Jimenez Ruiz
|
57fd528e9b
|
removed fixtures from deprecated column
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-27 12:20:17 +02:00 |
Alex Moreno
|
a98a927663
|
fix back test and e2e that now fail
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-27 11:17:45 +02:00 |
Carlos Jimenez Ruiz
|
6370471bd5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4223-claim_observations
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-27 11:01:42 +02:00 |
Alex Moreno
|
4155b45785
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-06-27 07:22:43 +02:00 |
Carlos Jimenez Ruiz
|
d183ccb843
|
feat(claim.notes): added the observations setction to claim plus refactors
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-06-25 15:22:47 +02:00 |
Alex Moreno
|
4d4e09fb9f
|
test(worker_time-control): new backTest and e2e using workerTimeControl_clockIn
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-06-23 14:07:53 +02:00 |
Joan Sanchez
|
2a758fd12a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4045-incoterms_authorization
|
2022-06-22 11:38:01 +02:00 |
Joan Sanchez
|
e5b1bfeec2
|
Merge branch 'dev' into 4231-worker.calendar_payedHolidays
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-21 10:59:46 +00:00 |
Vicent Llopis
|
6611fcb40e
|
fix: show correct payedHolidays
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-06-17 12:34:33 +02:00 |
Vicent Llopis
|
c49f563299
|
feat: add fixtures
|
2022-06-16 10:59:17 +02:00 |
Alex Moreno
|
8474fb5692
|
Merge branch 'dev' into 3498-staticDate
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-15 07:15:34 +00:00 |
Joan Sanchez
|
0e89616089
|
incoterms report refactor
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-06-13 11:03:11 +02:00 |
Alex Moreno
|
de0f7c98fa
|
Merge branch 'dev' into 3653-clientInsurance
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-10 05:32:58 +00:00 |
Alex Moreno
|
f786cdd33d
|
fix pass dates
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-09 14:39:51 +02:00 |
Alex Moreno
|
eb9bd66ddb
|
prepare for static dates
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-06-09 13:33:01 +02:00 |
Carlos Jimenez Ruiz
|
cd5dba6fcb
|
Merge branch 'dev' into 4040-chat_sendQueued
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-06-09 08:44:22 +00:00 |
Alex Moreno
|
7eec9de0aa
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-06-09 07:47:03 +02:00 |
Alex Moreno
|
61cc3c19f3
|
refactor(client): creditInsuarnce change creditClassification for creditClassificationFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-09 07:13:54 +02:00 |
Vicent Llopis
|
3eac002fb4
|
feat: add queue to send rocket messages
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-06-03 12:22:07 +02:00 |
Vicent Llopis
|
f6028316f4
|
feat: endpoint sendQueued addded
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-02 14:55:39 +02:00 |
Vicent Llopis
|
e9c98a98e7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-06-02 13:38:27 +02:00 |
Vicent Llopis
|
f7be419bbe
|
refator: updated fixtures
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-06-02 11:52:53 +02:00 |