Guillermo Bonet
|
66009ee0dd
|
Merge branch 'dev' into 8057-geoFk
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-18 09:52:55 +00:00 |
Guillermo Bonet
|
754c0cb9ab
|
Merge branch '8057-geoFk' of https://gitea.verdnatura.es/verdnatura/salix into 8057-geoFk
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2024-11-18 10:52:44 +01:00 |
Guillermo Bonet
|
a64f9b74ec
|
feat: refs #8057 Requested changes
|
2024-11-18 10:52:41 +01:00 |
Robert Ferrús
|
329488d700
|
Merge branch 'dev' into 8127-entry_updateComission
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-18 08:46:49 +00:00 |
Sergio De la torre
|
7d5928bc3d
|
Merge pull request 'feat: refs #8135 refs#8135 updateTicketACL' (!3210) from 8135-ticketACL into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3210
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-11-18 08:21:18 +00:00 |
Guillermo Bonet
|
e81727f3f8
|
Merge branch 'dev' into 8057-geoFk
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-18 07:58:51 +00:00 |
Guillermo Bonet
|
353ca659cd
|
feat: refs #8057 Requested changes
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2024-11-18 08:58:38 +01:00 |
Guillermo Bonet
|
b529ccfe29
|
feat: refs #7920 Added ItemShelving in shelvingLog
gitea/salix/pipeline/head This commit looks good
Details
|
2024-11-15 12:43:15 +01:00 |
Robert Ferrús
|
923296e85e
|
Merge branch 'dev' into 8127-entry_updateComission
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-15 10:34:34 +00:00 |
Guillermo Bonet
|
a3945070f2
|
refactor: refs #7920 No changes in itemShelvingLog table
gitea/salix/pipeline/head This commit looks good
Details
|
2024-11-15 11:34:18 +01:00 |
Robert Ferrús
|
c5f1b05671
|
feat: refs #8127 quitar esquemas
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-11-15 11:32:20 +01:00 |
Robert Ferrús
|
f7a5fc7e31
|
Merge branch 'dev' into 8127-entry_updateComission
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-15 10:06:45 +00:00 |
Sergio De la torre
|
07318656b7
|
feat: refs #8135 refs#8135 updateTicketACL
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-15 08:47:30 +01:00 |
Guillermo Bonet
|
e1a091535e
|
refactor: refs #7920 Fix version
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2024-11-15 08:45:28 +01:00 |
Guillermo Bonet
|
b5463e5560
|
refactor: refs #7920 Fix version
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-11-15 07:54:33 +01:00 |
Guillermo Bonet
|
e49285ace8
|
refactor: refs #7920 Fix version
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-11-15 07:51:37 +01:00 |
Guillermo Bonet
|
e344ae3bf2
|
refactor: refs #7920 Fix version
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-11-15 07:48:17 +01:00 |
Guillermo Bonet
|
48ffb80094
|
Merge branch 'dev' into 7920-itemShelving
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-15 06:40:41 +00:00 |
Guillermo Bonet
|
d1c528c8fd
|
Merge branch 'dev' into 7950-cmrModelUnify
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-15 06:03:36 +00:00 |
Guillermo Bonet
|
0fbef4c88a
|
Merge pull request 'fix: refs #7244 Added collection ACL' (!3198) from 7244-collectionAcl into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3198
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-11-15 06:01:48 +00:00 |
Jorge Penadés
|
4b659c0b48
|
fix: refs #6818 use right col type
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-14 16:39:35 +01:00 |
Jorge Penadés
|
f96b914649
|
fix: refs #6818 use right col type
|
2024-11-14 16:39:26 +01:00 |
Jorge Penadés
|
86c95e185c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6818-addDefaultChannel
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-14 16:32:40 +01:00 |
Jorge Penadés
|
eff251fbb5
|
feat: refs #7874 add default type
|
2024-11-14 15:46:51 +01:00 |
Alex Moreno
|
a8cb0b9eb8
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-11-14 12:21:13 +01:00 |
Jorge Penadés
|
a37332f7be
|
fix: refs #6818 add defaultChannel
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-14 11:18:38 +01:00 |
Jorge Penadés
|
25b05637a6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6818-addDefaultChannel
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-11-14 11:17:11 +01:00 |
Jorge Penadés
|
c8ab5d4344
|
fix: refs #6818 add defaultChannel
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2024-11-14 11:16:45 +01:00 |
Guillermo Bonet
|
d387486ea8
|
refactor: refs #7920 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-14 09:59:01 +01:00 |
Guillermo Bonet
|
8449a6c6d3
|
feat: refs #7244 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-14 09:42:59 +01:00 |
Guillermo Bonet
|
5f50d84213
|
feat: refs #7244 Requested changes
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2024-11-14 09:42:49 +01:00 |
Guillermo Bonet
|
b9397c527d
|
feat: refs #8057 Added data updates
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-14 09:32:02 +01:00 |
Guillermo Bonet
|
bde192966e
|
feat: refs #8057 Added data updates
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-14 09:30:36 +01:00 |
Guillermo Bonet
|
cba1abad68
|
feat: refs #8057 Added data updates
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-14 09:27:38 +01:00 |
Guillermo Bonet
|
d4b0da50d0
|
feat: refs #8057 Added data updates
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-14 09:00:19 +01:00 |
Guillermo Bonet
|
b7655b4f92
|
feat: refs #8057 Added geoFk columns
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-14 08:24:42 +01:00 |
Guillermo Bonet
|
97e53b2ef8
|
Merge branch 'dev' into 7950-cmrModelUnify
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-14 06:57:26 +00:00 |
Ivan Mas
|
e1b0fc298c
|
feat: refs #8143 deprecate recoverPass and sync from account.user
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-13 20:26:54 +01:00 |
Ivan Mas
|
21693cfd71
|
feat: refs #7994 new version script fix
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-11-13 14:33:52 +01:00 |
Guillermo Bonet
|
72e067ff81
|
fix: refs #7244 Added collection ACL
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-13 12:53:18 +01:00 |
Pablo Natek
|
5f3b1ff601
|
Merge pull request 'fix: refs #7404 filter an rounding issues' (!3196) from 7404-fix-stockBoughtDetailFilter into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3196
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-11-13 11:24:18 +00:00 |
Guillermo Bonet
|
782563f67d
|
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-11-13 12:19:42 +01:00 |
Guillermo Bonet
|
aa1c017f22
|
fix: refs #7779 ticket_splitItemPackingType
gitea/salix/pipeline/head This commit looks good
Details
|
2024-11-13 12:17:58 +01:00 |
Guillermo Bonet
|
5a134668da
|
refactor: refs #7920 itemShelvingLog
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-13 12:04:47 +01:00 |
Guillermo Bonet
|
9d5ef3eeb0
|
Merge branch 'dev' into 7920-itemShelving
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-11-13 10:16:57 +00:00 |
Guillermo Bonet
|
b3bf0024e3
|
refactor: refs #7920 Major changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-11-13 11:15:31 +01:00 |
Robert Ferrús
|
9b079a8bb2
|
Merge branch 'master' into 8169-itemTextureTag
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-11-13 09:45:23 +00:00 |
Guillermo Bonet
|
2273dc636e
|
refactor: refs #7920 Major changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-11-13 09:56:38 +01:00 |
Guillermo Bonet
|
172b4d8e05
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-11-13 09:40:30 +01:00 |
Guillermo Bonet
|
1086981b53
|
fix: refs #7779 ticket_splitItemPackingType
gitea/salix/pipeline/head This commit looks good
Details
|
2024-11-13 09:35:06 +01:00 |
Jorge Penadés
|
f52041eeff
|
Merge branch 'dev' into 6818-saySimpleIntegration
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-13 08:22:40 +00:00 |
Pablo Natek
|
b025a8b804
|
fix: refs #7404 filter an rounding issues
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-11-13 09:10:18 +01:00 |
Guillermo Bonet
|
779a75cd78
|
refactor: refs #7920 Major changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-11-13 09:03:44 +01:00 |
Guillermo Bonet
|
c2381f0feb
|
refactor: refs #7920 Main change
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-11-13 07:42:58 +01:00 |
Guillermo Bonet
|
ab2e35b64c
|
fix: refs #8153 Version
gitea/salix/pipeline/head This commit looks good
Details
|
2024-11-13 07:12:49 +01:00 |
Guillermo Bonet
|
628b67e1e5
|
fix: refs #8153 Version
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-11-13 07:10:52 +01:00 |
Guillermo Bonet
|
a426e9c7c6
|
Merge pull request 'refactor: refs #8153 Optimized order_getTax' (!3188) from 8153-order_getTaxOptimize into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #3188
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
|
2024-11-13 06:07:38 +00:00 |
Pako Natek
|
ebc0420531
|
fix: problem calculation updated
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-11-13 06:50:21 +01:00 |
Ivan Mas
|
4add10f3dd
|
feat: refs #7994 remove comment script
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-11-12 17:52:51 +01:00 |
Guillermo Bonet
|
127c6fced0
|
refactor: refs #8153 Optimized order_getTax
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-12 13:25:51 +01:00 |
Guillermo Bonet
|
6427a90c44
|
Merge branch 'dev' into 7950-cmrModelUnify
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-12 12:25:11 +00:00 |
Guillermo Bonet
|
2ece748138
|
refactor: refs #7242 Deleted select column
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-12 13:13:13 +01:00 |
Guillermo Bonet
|
a67ea6b15f
|
Merge pull request 'refactor: refs #7715 Deleted hasNewLabelMrwMethod column' (!3184) from 7715-byeMrwOld into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3184
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-11-12 12:09:54 +00:00 |
Guillermo Bonet
|
f45460b0e1
|
Merge branch 'dev' into 8153-order_getTaxOptimize
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-11-12 12:04:59 +00:00 |
Guillermo Bonet
|
d52f537f0c
|
refactor: refs #8153 Optimized order_getTax
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-11-12 13:04:23 +01:00 |
Robert Ferrús
|
d925a5d7fa
|
Merge branch 'master' into 8169-itemTextureTag
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-11-12 11:55:50 +00:00 |
Pako Natek
|
a9def89e01
|
Merge branch 'dev' into fixturesLocal
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-12 11:27:35 +00:00 |
Guillermo Bonet
|
dd3a854ec5
|
Merge pull request 'feat: refs #8080 Added column comment' (!3185) from 8080-duaComment into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3185
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
|
2024-11-12 10:48:17 +00:00 |
Guillermo Bonet
|
aec4d0b1a4
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-11-12 11:28:32 +01:00 |
Guillermo Bonet
|
f989b72fab
|
feat: refs #8080 Added column comment
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-12 10:18:00 +01:00 |
Guillermo Bonet
|
a921e51023
|
refactor: refs #7715 Deleted hasNewLabelMrwMethod column
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-12 09:51:48 +01:00 |
Jorge Penadés
|
0f5ca107f0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6818-saySimpleIntegration
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-12 09:45:19 +01:00 |
Pablo Natek
|
69999125c7
|
Merge branch 'master' into 7404-recoverStockBuyedProcs
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-11-12 07:51:59 +00:00 |
Pablo Natek
|
63425d31ae
|
fix: refs #7404 restore stockBuyed old proc
gitea/salix/pipeline/pr-master Build queued...
Details
|
2024-11-12 08:51:03 +01:00 |
Alex Moreno
|
d442593823
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-11-12 08:49:17 +01:00 |
Alex Moreno
|
07e59ccdbf
|
build: refs #8179 dump
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-11-12 08:45:40 +01:00 |
Robert Ferrús
|
55fced363e
|
Merge branch 'master' into 8169-itemTextureTag
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-11-12 07:42:58 +00:00 |
Pako Natek
|
eb3d0e837f
|
Merge branch 'dev' into fixturesLocal
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-12 07:29:08 +00:00 |
Pako Natek
|
76d072e00f
|
fix: more data for fixture.before
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2024-11-12 08:28:26 +01:00 |
Guillermo Bonet
|
90e7ab1ec1
|
refactor: refs #7950 Created cmr model
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-12 08:25:23 +01:00 |
Guillermo Bonet
|
5bbcf5005f
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-11-12 08:04:30 +01:00 |
Guillermo Bonet
|
3158644032
|
fix: refs #7994 commented alter
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-11-12 07:59:07 +01:00 |
Pablo Natek
|
82bcb48101
|
Merge pull request 'test' (!3179) from test into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3179
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-11-12 06:37:16 +00:00 |
Pablo Natek
|
3d3bc0dbaa
|
Merge branch 'test' into 7404-fix-remove-tickets-volume
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-11-12 06:24:06 +00:00 |
Pablo Natek
|
395e6997dd
|
Merge branch '7404-fix-remove-tickets-volume' of https://gitea.verdnatura.es/verdnatura/salix into 7404-fix-remove-tickets-volume
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-11-12 07:23:47 +01:00 |
Pablo Natek
|
2dd3ae1c75
|
fix: refs #7404 empty commit
|
2024-11-12 07:23:46 +01:00 |
Jorge Penadés
|
186312702d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6818-saySimpleIntegration
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-11 16:41:37 +01:00 |
Alex Moreno
|
180b0b5b3f
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-11-11 14:09:21 +01:00 |
Alex Moreno
|
c8d9cfd623
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-11-11 14:09:03 +01:00 |
Javi Gallego
|
eaad989b3a
|
fix: clean deletes also zoneEvent range records
gitea/salix/pipeline/head This commit looks good
Details
|
2024-11-11 13:57:49 +01:00 |
Alex Moreno
|
9f763ebae7
|
Merge branch 'dev' into 6828-supplier_companySize
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-11 12:41:43 +00:00 |
Guillermo Bonet
|
0dc77851c0
|
fix: refs #4948 Tests
gitea/salix/pipeline/head This commit looks good
Details
|
2024-11-11 11:34:37 +01:00 |
Alex Moreno
|
f7a29cd9c7
|
feat(Supplier): refs #6828 add companySize
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-11-11 10:32:17 +01:00 |
Pako Natek
|
35f4f161ab
|
fix(collection_new): remove agency condition for suitable tickets
gitea/salix/pipeline/pr-master This commit looks good
Details
Refs: #0000
|
2024-11-11 09:02:04 +01:00 |
Robert Ferrús
|
94ed23ca07
|
feat: refs #8169 modifica role
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-11-11 07:51:26 +01:00 |
Guillermo Bonet
|
a254cb19cd
|
feat: refs #4948 Added ticket_selfConsumptionPackaging
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-11-11 07:40:17 +01:00 |
Pablo Natek
|
82e62e8ee7
|
Merge branch 'test' into 7404-fix-remove-tickets-volume
|
2024-11-11 05:53:30 +00:00 |
Jorge Penadés
|
6ef1f950d1
|
feat: refs #6818 add config table
|
2024-11-08 17:47:10 +01:00 |
Pablo Natek
|
f8c3d69c5d
|
fix: refs #7404 remove volume from ticket sold on holland
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-11-08 13:44:20 +01:00 |
Jorge Penadés
|
9b28cf9130
|
feat: refs #6818 add records
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-08 12:51:09 +01:00 |