 Ivan Mas
|
5bb3dccd19
|
Merge branch 'dev' into 7161DeleteitemTrash
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 14:03:42 +00:00 |
|
Ivan Mas
|
6e183b7426
|
refs #7161 change vAddress to vAddressShortage
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 15:59:05 +02:00 |
 Robert Ferrús
|
a41aa46c3a
|
Merge branch 'dev' into 6500-procRefactor8
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 09:35:52 +00:00 |
 Juan Ferrer
|
42fe7fb1e2
|
feat(binlog): refs #4409 Disable order recalc from triggers
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-15 11:32:44 +02:00 |
 Jorge Penadés
|
200cbd8d74
|
fix: refs #6938 acls & scope
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 11:03:57 +02:00 |
|
Jorge Penadés
|
0219fa105e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6938-hideWorkerPhone
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 10:22:44 +02:00 |
|
Jorge Penadés
|
a68b8431c5
|
feat: refs #6938 add scope & acls
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 10:21:59 +02:00 |
|
Juan Ferrer
|
31e27f1926
|
Merge branch '4409-binlogQueueFn' of https://gitea.verdnatura.es/verdnatura/salix into 4409-binlogQueueFn
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 10:18:07 +02:00 |
|
Juan Ferrer
|
5414aaa1b4
|
fix(binlog): refs #4409 Fixtures for binlogQueue
|
2024-04-15 10:18:06 +02:00 |
|
Juan Ferrer
|
ba9e1d9233
|
Merge branch 'dev' into 4409-binlogQueueFn
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 08:16:56 +00:00 |
jcasado
|
dc8a6d1274
|
Merge branch 'dev' into 6641-checkboxMyTeam
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 10:11:36 +02:00 |
|
Juan Ferrer
|
50d6c234be
|
feat(binlog): refs #4409 New function for binlog queue monitoring
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 09:31:24 +02:00 |
|
Robert Ferrús
|
36b3a92ca3
|
Merge branch 'dev' into 6500-procRefactor8
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 05:18:54 +00:00 |
|
Robert Ferrús
|
f30f907d8e
|
feat: refs #6500 cambios solicitados
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-12 12:13:07 +02:00 |
 Pablo Natek
|
0d03cf76b4
|
fix(sql): refs #6005 fix fk formation
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-12 10:17:04 +02:00 |
|
Juan Ferrer
|
ccf77ed356
|
fix(util): refs #7205 util.slowLog_prune code clean
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-12 09:24:48 +02:00 |
|
Juan Ferrer
|
622075a9aa
|
fix(util): refs #7205 fix util.slowLog_prune
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-12 09:21:34 +02:00 |
|
Pablo Natek
|
3547299c70
|
Merge pull request '6005-backupLabeler' (!2276) from 6005-backupLabeler into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
Reviewed-on: #2276
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
|
2024-04-12 07:12:53 +00:00 |
 Guillermo Bonet
|
e516f90a0b
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-12 08:56:58 +02:00 |
|
Guillermo Bonet
|
d503018d5c
|
Fixtures Jorge
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-12 08:56:38 +02:00 |
|
Robert Ferrús
|
adadf70f1e
|
feat: refs #6500
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-12 08:44:06 +02:00 |
|
Robert Ferrús
|
800fa36d04
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6500-procRefactor8
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-12 08:40:50 +02:00 |
|
Guillermo Bonet
|
b5f3b5ebee
|
Fix version
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-12 08:19:57 +02:00 |
|
Guillermo Bonet
|
c0cabc894b
|
refactor: refs #7181 Added grant
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-12 08:08:49 +02:00 |
|
Guillermo Bonet
|
f0472b7ace
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-12 08:03:32 +02:00 |
|
Guillermo Bonet
|
69280c63b4
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-12 08:03:12 +02:00 |
|
Robert Ferrús
|
f545a57c9f
|
feat: refs #6500
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-12 07:58:18 +02:00 |
|
Guillermo Bonet
|
d86bb6b004
|
Merge pull request 'refactor: refs #7181 vn2008.Deleted risk_vs_client_list' (!2283) from 7181-risk_vs_client_list into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #2283
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-04-12 05:18:06 +00:00 |
|
Pablo Natek
|
726b1ddc07
|
Merge branch 'dev' into 6005-backupLabeler
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-12 05:14:29 +00:00 |
|
Juan Ferrer
|
3f1941293e
|
Merge branch 'master' into 7198-pbxPrefixSchedule
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-11 14:56:31 +00:00 |
|
Guillermo Bonet
|
ec481b4141
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-11 14:52:42 +02:00 |
|
Guillermo Bonet
|
2226922366
|
Merge branch 'master' into test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-04-11 14:52:16 +02:00 |
|
Guillermo Bonet
|
f69acf3a05
|
Merge branch 'dev' into 7181-risk_vs_client_list
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-11 12:41:37 +00:00 |
|
Robert Ferrús
|
04c5a9a004
|
Merge branch 'dev' into 6500-procRefactor8
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-11 12:21:32 +00:00 |
 Pako Natek
|
9de4095260
|
moreProcs
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-11 13:25:43 +02:00 |
|
Pako Natek
|
bff3aef73b
|
recovering procs
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-11 13:20:41 +02:00 |
|
Guillermo Bonet
|
c190d2bef1
|
Merge branch 'master' into ticket168996-hotfix
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-11 07:31:31 +00:00 |
|
Guillermo Bonet
|
c9b2bb5b5e
|
Merge branch 'dev' into 7181-risk_vs_client_list
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-11 07:29:32 +00:00 |
|
Guillermo Bonet
|
b1dc5efc8b
|
refactor: refs #7181 Requested changes
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2024-04-11 09:29:25 +02:00 |
 Alex Moreno
|
3635a4b6d0
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-11 07:46:16 +02:00 |
|
Pablo Natek
|
b2c3442c12
|
Merge branch 'master' into 7024-fixInventorryError
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-11 05:33:44 +00:00 |
|
Pablo Natek
|
68ca5d369c
|
fix: refs #7024 fix error on setting local variable
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-11 07:33:31 +02:00 |
|
Juan Ferrer
|
ce55058314
|
feat(pbx): refs #7198 country prefix, schedule
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-10 18:14:10 +02:00 |
|
Ivan Mas
|
83befbd120
|
Merge branch 'dev' into 6827-check-usernames-special-characters
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-10 15:21:42 +00:00 |
|
Guillermo Bonet
|
7b3472aa0b
|
refactor: refs #7181 Minor change
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-10 14:23:24 +02:00 |
|
Pablo Natek
|
2c5c2ca5a7
|
fix: refs #7024 fix condition sintax
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-10 14:17:08 +02:00 |
|
Guillermo Bonet
|
5044cd454d
|
refactor: refs #7181 vn2008.Deleted risk_vs_client_list
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-10 14:17:03 +02:00 |
|
Ivan Mas
|
08948ad360
|
Merge branch 'dev' into 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-10 12:05:04 +00:00 |
|
Robert Ferrús
|
e2eff4df54
|
Merge branch 'dev' into 6500-procRefactor8
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-10 12:04:40 +00:00 |
|
Pablo Natek
|
2e15b35fd1
|
fix: refs #7024 create exception for inventory
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-04-10 14:01:03 +02:00 |
|
Ivan Mas
|
0b7042d597
|
refs #6732 change Proveedores isReal
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-10 13:55:25 +02:00 |
|
Ivan Mas
|
85301b84bc
|
Merge branch 'dev' into 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-10 11:18:31 +00:00 |
|
jcasado
|
7d925bac87
|
refs #6641 fix PR changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-10 13:16:41 +02:00 |
|
Guillermo Bonet
|
1fe783cf0e
|
hotfix: ticket168996 Now ticket_doCmr ignore deliveryMethod
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-10 12:00:52 +02:00 |
 Javier Segarra
|
6edbada581
|
Merge branch 'dev' into 6427_sms_resetPassword
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-10 11:34:13 +02:00 |
|
Jorge Penadés
|
099fb70582
|
Merge branch 'dev' into 6492-refactorProceduresVn2008
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-10 09:29:15 +00:00 |
|
Pablo Natek
|
5602ed8835
|
Merge branch 'dev' into 6005-backupLabeler
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-10 07:17:42 +00:00 |
|
Robert Ferrús
|
2c91385e62
|
Merge branch '7150-greuge_dif_porte_add' of https://gitea.verdnatura.es/verdnatura/salix into 7150-greuge_dif_porte_add
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-10 08:09:57 +02:00 |
|
Robert Ferrús
|
c30c0de92c
|
feat: refs #7150
|
2024-04-10 08:09:54 +02:00 |
|
Robert Ferrús
|
3420667ae5
|
Merge branch 'dev' into 7150-greuge_dif_porte_add
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-10 06:05:03 +00:00 |
|
Ivan Mas
|
eedf30a2dd
|
refs #6732 salix dependencies and undo changes Proveedores
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-09 17:31:34 +02:00 |
|
Jorge Penadés
|
a3c1bceb7e
|
refactor: refs #6492 use enum
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-09 15:57:34 +02:00 |
|
Jorge Penadés
|
dca75437f1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-09 15:20:30 +02:00 |
|
Pablo Natek
|
ed517399dc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler
|
2024-04-09 15:04:04 +02:00 |
|
Ivan Mas
|
f02c4354ba
|
Merge branch 'dev' into 6827-check-usernames-special-characters
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-09 14:45:29 +02:00 |
|
Ivan Mas
|
521033edd2
|
Merge branch 'dev' into 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-09 11:54:41 +00:00 |
|
Ivan Mas
|
90c26959af
|
refs #7161 change longName to name
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-09 13:39:33 +02:00 |
|
Pablo Natek
|
da037c5235
|
refactor: refs #6005 delay on productionConfig
|
2024-04-09 13:34:33 +02:00 |
|
Ivan Mas
|
b75af7b192
|
Merge branch 'dev' into 7161DeleteitemTrash
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-09 11:22:32 +00:00 |
|
Guillermo Bonet
|
0e2e68488d
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-09 13:08:54 +02:00 |
|
Robert Ferrús
|
c6ece4619f
|
feat: refs #6500
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-09 11:40:12 +02:00 |
|
Jorge Penadés
|
9a28a59d00
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-09 11:11:30 +02:00 |
|
Alex Moreno
|
c69a4e1c98
|
Merge pull request 'refactor(workerDms): adapat to lilium' (!2269) from 6551-workerDms_refactor into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2269
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
|
2024-04-09 08:21:20 +00:00 |
|
Guillermo Bonet
|
f8be6be7a3
|
feat: refs #6636 Minor change
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-09 10:10:11 +02:00 |
|
Guillermo Bonet
|
c42e00f11e
|
Merge branch 'dev' into 6636-pickup
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-09 07:43:51 +00:00 |
|
Pablo Natek
|
7cb40f5d89
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-09 09:42:39 +02:00 |
|
Robert Ferrús
|
4a31fe29b8
|
Merge branch 'dev' into 7150-greuge_dif_porte_add
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-09 05:40:01 +00:00 |
Sergio De la torre
|
75293fbb9a
|
refs #6276 hotFix:itemShelving_add
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-09 07:38:28 +02:00 |
|
Robert Ferrús
|
1743f7501a
|
Merge branch 'dev' into 6500-procRefactor8
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-09 05:37:18 +00:00 |
|
Robert Ferrús
|
2c0c346a7b
|
feat: refs #6500
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-09 07:34:43 +02:00 |
|
Pablo Natek
|
1c064c7bfc
|
Merge branch 'dev' into 6021-floranet_RedMoon
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-09 05:23:34 +00:00 |
|
Alex Moreno
|
0ecc09fcc4
|
Merge branch 'dev' into 6551-workerDms_refactor
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-08 12:50:05 +00:00 |
|
Alex Moreno
|
9134216332
|
refactor(workerDms): adapat to lilium
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2024-04-08 14:46:35 +02:00 |
|
Pako Natek
|
2eb229adf7
|
catalogue fixed
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-08 14:30:46 +02:00 |
|
Robert Ferrús
|
6ba43a3c6d
|
Merge branch 'dev' into 7150-greuge_dif_porte_add
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-08 11:29:09 +00:00 |
|
Juan Ferrer
|
75bed03ab7
|
Merge pull request 'test' (!2266) from test into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2266
|
2024-04-08 11:09:05 +00:00 |
|
Juan Ferrer
|
ccc644c298
|
fix: refs #6021 dump, floranet schema added
gitea/salix/pipeline/pr-test Build started...
Details
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-08 13:07:04 +02:00 |
 Carlos Andrés
|
5558e92b1e
|
Merge pull request 'fix: closeTicket idem salix refs #6549' (!2163) from 6549-ticket_close into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2163
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-04-08 10:36:21 +00:00 |
|
Robert Ferrús
|
0c5b9e3544
|
Merge branch 'dev' into 7150-greuge_dif_porte_add
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-08 10:28:02 +00:00 |
|
Robert Ferrús
|
d595a7b2fa
|
feat: refs #6500
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-08 12:22:15 +02:00 |
|
Robert Ferrús
|
2d18f01a15
|
feat: refs #6500
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-08 12:18:13 +02:00 |
|
Robert Ferrús
|
dddcacee7a
|
feat: refs #6500
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-08 12:01:27 +02:00 |
|
Robert Ferrús
|
2037b17f4e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6500-procRefactor8
|
2024-04-08 11:57:00 +02:00 |
|
Guillermo Bonet
|
0b96471c7d
|
feat: refs #6714 Added businessType zone_getAddresses
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-08 09:27:07 +02:00 |
|
Robert Ferrús
|
657150a9a7
|
feat: refs #7150 greuge_dif_porte_add
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-08 08:57:56 +02:00 |
|
Robert Ferrús
|
1e8e6a67a3
|
Merge branch 'dev' into 7150-greuge_dif_porte_add
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-08 06:39:22 +00:00 |
|
Robert Ferrús
|
5517c29c1c
|
fet: refs #7150 greuge_dif_porte_add
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-08 08:37:37 +02:00 |
|
Guillermo Bonet
|
e27279e20e
|
Merge branch 'dev' into 6636-pickup
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-08 05:18:36 +00:00 |
|
Alex Moreno
|
93000aaecf
|
Merge branch 'dev' into 6549-ticket_close
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-05 12:20:09 +00:00 |
|
Carlos Andrés
|
cedfdbb421
|
fix: closeTicket idem salix Refs: #6549
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-05 13:22:54 +02:00 |