 Vicent Llopis
|
810a1afcd9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel
|
2023-01-05 11:40:25 +01:00 |
 Alex Moreno
|
ef437f2fee
|
test: e2e and backTest
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-03 14:50:29 +01:00 |
 Pau
|
1653439c44
|
Merge branch 'dev' into 4797-lilium-worker-notifications
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-03 12:33:21 +00:00 |
|
Vicent Llopis
|
25dad4b358
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked
|
2023-01-03 13:03:36 +01:00 |
|
Alex Moreno
|
29483bcc1b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
|
2023-01-03 12:28:55 +01:00 |
 Alexandre Riera
|
6185b2f055
|
refs #5051 changed fixture
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-03 12:04:38 +01:00 |
|
Alex Moreno
|
aa5cfde1ae
|
test(worker_new): add back tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-02 14:52:03 +01:00 |
|
Alexandre Riera
|
96f2e4b542
|
refs #5051 skipped tests and changed fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-02 13:35:33 +01:00 |
|
Alex Moreno
|
2c5e42d408
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-28 11:49:16 +01:00 |
|
Pau
|
ea7f4b7c02
|
remove broken fixture
|
2022-12-27 10:34:12 +01:00 |
|
Pau
|
3ca1d1f4ee
|
remove error in fixtures
|
2022-12-27 10:29:15 +01:00 |
|
Pau
|
deb730aae7
|
solve fixture error
|
2022-12-27 09:21:02 +01:00 |
|
Pau
|
7a5993b4fe
|
Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-26 07:12:13 +01:00 |
|
Vicent Llopis
|
fb325d5e65
|
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-12-23 12:34:51 +01:00 |
|
Vicent Llopis
|
16c20e4700
|
feat: add itemShelvingSale popup
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-23 12:08:16 +01:00 |
|
Alexandre Riera
|
eefc5ab80d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat
|
2022-12-23 08:01:52 +01:00 |
 Joan Sanchez
|
7c33cd2691
|
Merge pull request '4649-bookEntriesIncorrectly_notification' (!1188) from 4649-bookEntriesIncorrectly_notification into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #1188
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-12-22 10:43:20 +00:00 |
|
Pau
|
a8ca163321
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4732-previa-label
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-22 10:49:41 +01:00 |
|
Pau
|
fce0352986
|
add fixtures
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-22 10:41:07 +01:00 |
|
Vicent Llopis
|
7f80c7ed2c
|
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-22 09:30:35 +01:00 |
|
Vicent Llopis
|
06075aa17b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4804-ticket.descriptor_sms
|
2022-12-21 12:15:21 +01:00 |
|
Vicent Llopis
|
e4f4e70cc6
|
Merge branch 'dev' into 4649-bookEntriesIncorrectly_notification
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-21 08:26:53 +00:00 |
|
Vicent Llopis
|
6634ebcec5
|
fix: id duplicado en util.notification
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-21 09:25:52 +01:00 |
|
Vicent Llopis
|
1d7145d74b
|
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-21 08:05:19 +01:00 |
|
Pau
|
1430749892
|
Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-21 07:02:02 +00:00 |
|
Alexandre Riera
|
5b87514501
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-20 12:15:50 +01:00 |
|
Alexandre Riera
|
721123381c
|
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-20 11:54:22 +01:00 |
|
Vicent Llopis
|
1ddaf7ff08
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification
|
2022-12-20 10:52:23 +01:00 |
|
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 |