 Jon Elias
|
0f4e1acf09
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6514-gestDocSupplier
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-26 08:37:51 +01:00 |
 Alex Moreno
|
2212899400
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-26 08:35:38 +01:00 |
|
Jon Elias
|
04e42cd3c8
|
feat: #6514 created supplierDms functionality
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-26 08:29:07 +01:00 |
|
Alex Moreno
|
6d2ab2f4f3
|
refs #7118 deploy: dump
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-03-26 08:24:24 +01:00 |
|
Alex Moreno
|
dce0155c00
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-03-26 08:18:47 +01:00 |
|
Jon Elias
|
c830c48ca9
|
Merge pull request 'style: #6556 set default user image, set users image' (!2168) from 6556-ChangeImages into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2168
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-03-26 06:35:10 +00:00 |
 Robert Ferrús
|
dd977fab83
|
fix: refs #7141 catalog_calculate
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-03-25 14:56:12 +01:00 |
|
Jon Elias
|
415b829db0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6514-gestDocSupplier
|
2024-03-25 14:40:02 +01:00 |
 Pako Natek
|
10a16fccd8
|
primer prototipo
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-25 13:03:11 +01:00 |
 Guillermo Bonet
|
bde8742147
|
fix: refs #7024 entry_checkBooked
gitea/salix/pipeline/head This commit looks good
Details
|
2024-03-25 12:51:47 +01:00 |
|
Guillermo Bonet
|
092eaab851
|
Merge pull request 'feat: refs #7024 Added entry_checkBooked' (!2201) from 7024-entry_checkBooked into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2201
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
|
2024-03-25 11:11:51 +00:00 |
|
Jon Elias
|
3d2c4f8be3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6556-ChangeImages
|
2024-03-25 09:54:14 +01:00 |
|
Guillermo Bonet
|
df115ec58b
|
refactor: refs #6880 vn.professionalCategory changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-25 09:41:05 +01:00 |
|
Guillermo Bonet
|
17e61b9caa
|
feat: refs #7024 Minor change
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-25 08:50:18 +01:00 |
|
Guillermo Bonet
|
4005fe9064
|
feat: refs #7024 Added entry_checkBooked
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-25 08:47:06 +01:00 |
 Jorge Penadés
|
256ae359ce
|
Merge branch 'dev' into 6951-ticketCloneAll
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-25 07:46:38 +00:00 |
 Sergio De la torre
|
b179fc1b5a
|
Merge branch 'master' into 6276-newWarehouse-salix
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-03-25 07:04:41 +00:00 |
 Javi Gallego
|
8d258254d0
|
feat: #7013 change name procedure
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-25 07:52:40 +01:00 |
|
Javi Gallego
|
3f3ba3c612
|
Merge branch 'dev' into 7013-solunionRiskRequest
|
2024-03-25 07:52:01 +01:00 |
|
Jorge Penadés
|
0867f4d501
|
fix: refs #6951 var names & procedure name
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-22 16:01:22 +01:00 |
|
Jorge Penadés
|
e8d1967e11
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-22 15:14:12 +01:00 |
 Ivan Mas
|
b9bcc5b2cf
|
refs #6966 changes required
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-22 15:06:57 +01:00 |
|
Guillermo Bonet
|
5070d4d46f
|
hotfix item_getSimilar
gitea/salix/pipeline/head This commit looks good
Details
|
2024-03-22 14:59:39 +01:00 |
|
Ivan Mas
|
3851d967f4
|
refs #6966 Modify name sale_replaceItem
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-22 13:56:46 +01:00 |
|
Ivan Mas
|
8a51df2fe5
|
refs #6498 Delete multipleInventoryHistory
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-22 12:28:23 +01:00 |
|
Guillermo Bonet
|
bda80e03ee
|
Hotfix item_getSimilar
gitea/salix/pipeline/head This commit looks good
Details
|
2024-03-22 11:36:26 +01:00 |
 Pablo Natek
|
531bd9ef80
|
Merge branch 'dev' into 6021-floranet
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-22 10:17:49 +00:00 |
|
Pako Natek
|
214aff403a
|
delete fixtures local
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-22 11:09:49 +01:00 |
|
Pako Natek
|
8fd7792e7c
|
gitignore
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-22 11:05:48 +01:00 |
|
Jon Elias
|
595b86b33e
|
refs #6556 fixed hash changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-22 10:10:40 +01:00 |
|
Jon Elias
|
c49b8bf954
|
refactor: refs #6556 minor changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-22 09:35:09 +01:00 |
|
Jon Elias
|
eadd8f750d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6556-ChangeImages
|
2024-03-22 08:22:49 +01:00 |
|
Guillermo Bonet
|
17f6327339
|
Merge pull request 'fix: refs #7018 Fix invoiceInTax_recalc' (!2192) from 7018-invoiceInTax_rec into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2192
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-03-22 06:38:50 +00:00 |
|
Guillermo Bonet
|
9e62db6d01
|
Merge pull request 'refactor: refs #6923 Deteted procs' (!2180) from 6923-migratedProcs into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2180
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
|
2024-03-22 06:12:48 +00:00 |
|
Sergio De la torre
|
0116389290
|
Merge branch 'master' into 6276-newWarehouse-salix
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-03-22 06:01:17 +00:00 |
 Carlos Satorres
|
ca0d269ee2
|
refs #6074 remove isBlocked
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-21 15:02:09 +01:00 |
|
Guillermo Bonet
|
84056e3c2a
|
Merge branch 'dev' into 7018-invoiceInTax_rec
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-21 14:57:47 +01:00 |
|
Guillermo Bonet
|
122fe7eecd
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-dev Build started...
Details
|
2024-03-21 14:46:09 +01:00 |
|
Guillermo Bonet
|
2b26153bfa
|
refactor: refs #7018 Requested changes
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-03-21 12:52:04 +01:00 |
|
Guillermo Bonet
|
ee67820c20
|
refactor: refs #7018 Fix invoiceInTax_recalc
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-21 12:14:48 +01:00 |
|
Guillermo Bonet
|
535dd40625
|
fix: refs #7018 Fix invoiceInTax_recalc
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-21 12:06:59 +01:00 |
|
Ivan Mas
|
c33c90aefe
|
Merge branch 'dev' into 6499-procRefactor6
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-21 10:39:05 +00:00 |
|
Guillermo Bonet
|
d0067c8096
|
ticket #167473 Hotfix
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-03-21 11:30:10 +01:00 |
|
Javi Gallego
|
a24d38128b
|
feat: #7013 muestra solo clientes asegurados
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-21 10:48:43 +01:00 |
|
Javi Gallego
|
c46e7227e7
|
feat: #7013 solo muestra clientes asegurados
|
2024-03-21 10:40:30 +01:00 |
|
Pablo Natek
|
130fb68d27
|
Merge pull request 'feat: refs #6302 delete after add to turn' (!2187) from 6302-delete-ticket-after-add-to-turn into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2187
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-03-21 09:28:39 +00:00 |
|
Javi Gallego
|
20a338f746
|
feat: #7120 specialPrice with new fiels
|
2024-03-21 10:25:08 +01:00 |
|
Sergio De la torre
|
9eee26cbe9
|
refs #6276 feat:newWarehouse
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-03-21 10:18:54 +01:00 |
|
Guillermo Bonet
|
1cd495df06
|
fix: refs #7018 Fix invoiceInTax_recalc
gitea/salix/pipeline/pr-master This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
|
2024-03-21 09:25:33 +01:00 |
|
Guillermo Bonet
|
844291fec9
|
Merge branch 'dev' into 6923-migratedProcs
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-21 07:20:23 +00:00 |
|
Alex Moreno
|
b087c35a36
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-03-21 08:01:05 +01:00 |
|
Pablo Natek
|
f7b458d368
|
feat: refs #6302 delete after add to turn
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-20 20:54:24 +01:00 |
|
Alex Moreno
|
adddcc96aa
|
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-03-20 15:01:17 +01:00 |
|
Carlos Satorres
|
5a45cf7ea2
|
refs #6842 remove sage
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-20 13:39:26 +01:00 |
|
Guillermo Bonet
|
d53a053ccb
|
refactor: refs #6923 Deteted procs
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-20 13:07:02 +01:00 |
|
Guillermo Bonet
|
cdaa7999d1
|
Merge branch 'dev' into 6395-buyBuyerFk
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-20 07:55:05 +00:00 |
|
Guillermo Bonet
|
397b49db91
|
fix: refs #6232 Comment conveyorConfig lines
gitea/salix/pipeline/head This commit looks good
Details
|
2024-03-20 08:02:11 +01:00 |
|
Guillermo Bonet
|
b327120932
|
fix: refs #6232 Comment queueConfig lines
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-03-20 07:39:38 +01:00 |
|
Guillermo Bonet
|
8a96327d97
|
Merge branch 'dev' into 6232-refactorConfigTables
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-20 06:17:06 +00:00 |
|
Pako Natek
|
8f54a7f12d
|
deliveryDate
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-18 14:03:16 +01:00 |
|
Alex Moreno
|
4f90fb06d8
|
hotFix(debug) varchar to text
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-03-18 13:25:23 +01:00 |
|
Jon Elias
|
8e237f84c1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6556-ChangeImages
|
2024-03-18 11:55:55 +01:00 |
|
Jorge Penadés
|
07326e502b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll
|
2024-03-18 08:23:47 +01:00 |
|
Jorge Penadés
|
f044809f30
|
feat: refs #6951 to create back
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-15 15:45:47 +01:00 |
|
Guillermo Bonet
|
3aa81d27e7
|
refs #6875 Packing default 1
gitea/salix/pipeline/head This commit looks good
Details
|
2024-03-15 14:53:31 +01:00 |
|
Jorge Penadés
|
0fd6a6360c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll
|
2024-03-15 14:18:02 +01:00 |
|
Jon Elias
|
6d4f07adc3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6556-ChangeImages
|
2024-03-15 14:13:24 +01:00 |
 Javier Segarra
|
0f4377ff5d
|
refs #5858 test: fixtures
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-15 13:31:51 +01:00 |
|
Javier Segarra
|
bfdbbc0fdf
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
|
2024-03-15 12:22:57 +01:00 |
|
Guillermo Bonet
|
336d5f0fba
|
Merge branch 'dev' into 6232-refactorConfigTables
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-15 10:48:42 +00:00 |
|
Guillermo Bonet
|
158ed9b55c
|
refs #6232 Regularized config tables
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2024-03-15 11:49:33 +01:00 |
|
Jorge Penadés
|
c1018d465a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-15 11:01:59 +01:00 |
|
Guillermo Bonet
|
ea054eafd5
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-03-15 10:56:11 +01:00 |
|
Guillermo Bonet
|
aa27eb1922
|
refs #6948 Fix error
gitea/salix/pipeline/head This commit looks good
Details
|
2024-03-15 10:55:39 +01:00 |
|
Jorge Penadés
|
a38f93b0e3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-15 10:44:37 +01:00 |
|
Jorge Penadés
|
690d935429
|
refactor: refs #6951 cloneAll
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-15 10:00:24 +01:00 |
|
Carlos Satorres
|
1c523d8d22
|
Merge branch 'dev' into 6842-sageMod
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-15 08:43:41 +00:00 |
|
Javier Segarra
|
6989299593
|
Merge branch 'dev' into 6930_scopedToken_Multimedia
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-15 08:26:45 +00:00 |
 Carlos Andrés
|
160d72e755
|
hotfix upload invoiceIn_add.sql error
gitea/salix/pipeline/head This commit looks good
Details
|
2024-03-14 17:02:07 +01:00 |
|
Jon Elias
|
82001d8352
|
Merge branch 'dev' into 6556-ChangeImages
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-14 14:11:06 +00:00 |
|
Jon Elias
|
d8a5bf8c84
|
style: #6556 set default user image, set users image
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-14 15:04:35 +01:00 |
|
Carlos Andrés
|
3999533707
|
Merge branch 'test' into 6960-restricciones-AWB
gitea/salix/pipeline/pr-test This commit looks good
Details
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-03-14 11:33:14 +01:00 |
|
Carlos Andrés
|
1e29b6c1ed
|
merge test
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
gitea/salix/pipeline/pr-test There was a failure building this commit
Details
|
2024-03-14 11:30:07 +01:00 |
|
Guillermo Bonet
|
184a3a3c7a
|
refs #6395 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-14 10:05:25 +01:00 |
|
Guillermo Bonet
|
166b74c70d
|
Merge branch 'dev' into 6395-buyBuyerFk
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-14 08:59:22 +00:00 |
|
Carlos Satorres
|
1457884252
|
Merge branch 'dev' into 6755-restoreRefactor
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-14 08:54:06 +00:00 |
|
Carlos Satorres
|
dd7c700130
|
refs #6755 fix test
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-14 09:53:50 +01:00 |
|
Guillermo Bonet
|
fbeb9b058d
|
hotfix: itemProposal added optimizer_search_depth
gitea/salix/pipeline/head This commit looks good
Details
|
2024-03-14 09:34:37 +01:00 |
|
Guillermo Bonet
|
ad7b7be661
|
refs #6875 Fix version
gitea/salix/pipeline/head This commit looks good
Details
|
2024-03-14 09:15:19 +01:00 |
|
Guillermo Bonet
|
08359cdfe0
|
Merge pull request 'refactor: refs #6875 Add restriction on vn.buy.packing field not null and > 0' (!2047) from 6875-packingNotNull into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #2047
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-03-14 08:05:11 +00:00 |
|
Alex Moreno
|
0ad052c34a
|
refs #7033 deploy(2412): dev to test
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-03-14 08:36:19 +01:00 |
|
Carlos Satorres
|
7895f12e3d
|
Merge branch 'dev' into 6842-sageMod
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-14 07:28:12 +00:00 |
|
Carlos Satorres
|
2d8f5f5f50
|
Merge branch '6842-sageMod' of https://gitea.verdnatura.es/verdnatura/salix into 6842-sageMod
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-14 08:26:52 +01:00 |
|
Carlos Satorres
|
e24eed16c1
|
refs #6842 fix companyCode
|
2024-03-14 08:26:50 +01:00 |
|
Guillermo Bonet
|
b4b6b47a9c
|
hotfix: itemProposal added transaction
gitea/salix/pipeline/head This commit looks good
Details
|
2024-03-14 07:53:24 +01:00 |
|
Guillermo Bonet
|
4b83d416b2
|
Merge pull request 'refactor: refs #7018 Mirated procs to vn' (!2157) from 7018-procMigration into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2157
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
|
2024-03-14 06:03:32 +00:00 |
|
Javier Segarra
|
4012b1756d
|
refs #5858 add comment
|
2024-03-13 15:00:12 +01:00 |
|
Carlos Satorres
|
1315bfda88
|
refs #6755 fix test
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-13 14:18:53 +01:00 |
|
Pako Natek
|
67b55ae845
|
fixtures local
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-13 14:16:27 +01:00 |
|
Pako Natek
|
25f979156a
|
nuevo url para catalogue y sliders_get
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-13 14:00:59 +01:00 |