Alexandre Riera
|
0009f27462
|
Merge branch 'dev' into 4503-opcion-rocket
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-20 06:55:11 +00:00 |
Alex Moreno
|
5d2b69d063
|
test(item_fixedPrice): front recalculateRate2
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-19 15:06:59 +01:00 |
Alex Moreno
|
f82870bec6
|
feat(item_fixed-price): recalculate rate2 and when change item keep minPrice of item
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-19 14:39:38 +01:00 |
Pau
|
6b3876b200
|
Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-19 12:26:52 +00:00 |
Pau
|
5a01e49f27
|
Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-19 12:25:58 +00:00 |
Guillermo Bonet
|
dc82e610b7
|
refs #4975 Minor changes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-19 11:24:18 +01:00 |
Pau
|
a34c006dc9
|
Merge branch 'dev' into #288-traducir-state-i18n
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-19 08:14:02 +00:00 |
Joan Sanchez
|
c94c8a159e
|
Merge pull request '4548 fix: invoiceIn' (!1211) from 4548-invoiceIn-pdf-2 into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1211
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-12-19 07:45:32 +00:00 |
Alex Moreno
|
17a3896c1c
|
Merge branch 'dev' into 4548-invoiceIn-pdf-2
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-19 07:32:52 +00:00 |
Pau
|
07d52f551d
|
Merge branch 'dev' into #288-traducir-state-i18n
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-19 06:56:06 +00:00 |
Pau
|
43b957cb9b
|
Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-19 06:50:33 +00: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 |
Pau
|
410e51f96b
|
Merge pull request 'removed pending from working test' (!1195) from 4875-skip-tests into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1195
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-12-19 06:43:31 +00:00 |
Pau
|
d356e5352b
|
delete old files
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-19 07:41:15 +01:00 |
Pau
|
055a479aba
|
Merge branch 'dev' into #288-traducir-state-i18n
|
2022-12-19 07:40:56 +01:00 |
Pau
|
cc6e2a8d01
|
remove package locks to avoid merge conflicts
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-19 07:30:47 +01:00 |
Joan Sanchez
|
3524c027a0
|
Merge pull request 'TEST_hotFix_disable_outLayout' (!1210) from hotFix_disable_outLayout into test
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1210
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
|
2022-12-19 06:30:24 +00:00 |
Guillermo Bonet
|
a46c2ced7c
|
refs #4975: Added last mdbVersion/last method
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-19 07:26:07 +01:00 |
Pau
|
28e0d0566c
|
Merge branch 'dev' into 4875-skip-tests
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-19 06:13:45 +00: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 |
Alexandre Riera
|
6130547420
|
Merge branch 'dev' into 4503-opcion-rocket
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-16 12:42:42 +00:00 |
Alexandre Riera
|
98c9e0ac50
|
refs #4962 autoload added and second header
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-16 13:42:23 +01:00 |
Alexandre Riera
|
fb4432b088
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-16 13:06:06 +01:00 |
Alexandre Riera
|
93602a4ea0
|
Merge branch '4928-supplier-payMethod-notify' of https://gitea.verdnatura.es/verdnatura/salix into 4928-supplier-payMethod-notify
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-16 12:50:12 +01:00 |
Alexandre Riera
|
b72cb64bf8
|
refs #4928 findById
|
2022-12-16 12:50:09 +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 |
Alex Moreno
|
2a8a928ac5
|
feat: create invoiceIn
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-16 10:36:18 +01:00 |
Alexandre Riera
|
855f00b1c9
|
Merge branch '4700-split-tour' into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-16 09:51:40 +01:00 |
Carlos Andrés
|
98b8d652cb
|
Merge pull request 'refs #4865 Sintaxis mensajes rocket' (!1180) from 4865-sintaxis-mensajes-de-rocket into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1180
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2022-12-16 08:42:55 +00:00 |
Alex Moreno
|
47f624ec04
|
skip e2e test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-16 09:01:30 +01:00 |
Vicent Llopis
|
85148ab929
|
refactor: movidos changes sql
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-16 08:59:06 +01: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 |
Carlos Andrés
|
be5ee91fc4
|
Merge branch 'dev' into 4865-sintaxis-mensajes-de-rocket
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-16 07:44:47 +00:00 |
Alex Moreno
|
19cbd5b57b
|
fix css
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-16 08:43:34 +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
|
e7883d1c59
|
Removed deprecated foreign key
|
2022-12-16 08:39:59 +01:00 |
Joan Sanchez
|
5b23ee6d5a
|
Removed deprecated fields
|
2022-12-16 08:10:39 +01:00 |
Alex Moreno
|
b8a0d179f1
|
Merge branch 'dev' into 4928-supplier-payMethod-notify
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-16 07:08:39 +00:00 |
Joan Sanchez
|
f9593b121f
|
Merge pull request 'Use proper module codes' (!1206) from 4919-module_code into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1206
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2022-12-16 06:58:51 +00:00 |
Alexandre Riera
|
900b378c88
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-16 07:56:38 +01:00 |
Alex Moreno
|
ed68637059
|
disable outLayout
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-15 15:05:17 +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 |
Carlos Andrés
|
31d7145c51
|
Merge branch 'dev' into 4865-sintaxis-mensajes-de-rocket
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-15 13:28:34 +00:00 |
Vicent Llopis
|
1fcf5a85a6
|
Merge pull request 'fixes #4990 acquireTimeout to 60000' (!1209) from 4990-fix-jenkins-backTests into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1209
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
|
2022-12-15 13:27:15 +00: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
|
92a961ecc9
|
refs #3302 refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-15 14:24:57 +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 |
Alex Moreno
|
4b16b413dc
|
fixes #4990 acquireTimeout to 60000
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-15 14:09:35 +01:00 |
Alex Moreno
|
bab6fa0c9d
|
acquireTimeout: 60000
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-15 14:02:18 +01:00 |
Alex Moreno
|
5cc8764a3f
|
acquireTimeout 10000
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-15 13:54:17 +01:00 |