Commit Graph

2115 Commits

Author SHA1 Message Date
Javi Gallego 153e002cb8 Merge branch 'dev' into 6392-balance-produccion-propia 2024-02-06 15:54:06 +01:00
Robert Ferrús 0fc1caeae6 Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 13:56:24 +00:00
Robert Ferrús 714cd3c2c3 feat: refs #6777
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 14:55:20 +01:00
Robert Ferrús c598e62d1e feat: refs #6777 change dependencies vn2008 to vn part7
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 14:03:33 +01:00
Guillermo Bonet c3174c0c38 Merge branch 'dev' into 6778-changeViewDependencesVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 13:02:30 +00:00
Sergio De la torre 8af2cabaea refs #6281 feat:buyFk in itemShelving
gitea/salix/pipeline/pr-dev Build queued... Details
2024-02-06 13:31:58 +01:00
Sergio De la torre 6ebcb53863 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado 2024-02-06 10:44:15 +01:00
Ivan Mas a2fcf2df23 Merge branch 'dev' into 6444-MigrateVn2008.intrastat_netoFunctionToVn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 09:25:34 +00:00
Juan Ferrer edb445b080 Merge branch 'dev' into 6444-MigrateVn2008.intrastat_netoFunctionToVn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 09:11:54 +00:00
Juanjo Breso 6b5e1ecc01 Merge branch 'dev' into 5167-kk-warehouseAlias-y-warehouseJoined
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 09:07:43 +00:00
Ivan Mas c3912dd098 Merge branch 'dev' into refs-#6665-Clean-Views-vn2008-(1/9)
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 08:51:57 +00:00
Juanjo Breso c4eea81723 Merge branch 'dev' into 5167-kk-warehouseAlias-y-warehouseJoined
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 08:43:30 +00:00
Javi Gallego 19ab90a03c Merge branch 'dev' into 6392-balance-produccion-propia 2024-02-06 09:24:19 +01:00
Guillermo Bonet 8c13ebc5fc Merge branch 'dev' into 6778-changeViewDependencesVn2008
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-06 08:23:18 +00:00
Ivan Mas 5729ba90d1 Merge branch 'dev' into 6445-Remove-Vn2008.red-Function
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 08:04:50 +00:00
Jorge Penadés fd4b246bd6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 08:41:30 +01:00
Ivan Mas 438af34d73 refs #6444 cambio vUnits por vStems
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-06 08:40:06 +01:00
Robert Ferrús 00d64b2a57 Merge branch '6777-changeDependenciesVn2008toVnPart7' of https://gitea.verdnatura.es/verdnatura/salix into 6777-changeDependenciesVn2008toVnPart7
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 08:37:30 +01:00
Robert Ferrús 3500886149 feat: refs #6777 tabulacion 2024-02-06 08:37:28 +01:00
Guillermo Bonet a72acbb08f fix: refs# 6642 Bug apply version
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 08:21:34 +01:00
Juanjo Breso 923d6a610a Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte2
gitea/salix/pipeline/pr-dev Something is wrong with the build of this commit Details
2024-02-06 07:20:18 +00:00
Guillermo Bonet f67b5fabe6 Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-06 08:18:39 +01:00
Guillermo Bonet 8ccaacbc07 fix: refs# 6642 Bug apply version
gitea/salix/pipeline/head This commit looks good Details
2024-02-06 08:15:25 +01:00
Alex Moreno f7a93a7ccb Merge branch 'dev' into 4466-invoiceInRectificated
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 07:06:16 +00:00
Juanjo Breso 9f6807204d feat: refs #5167 changes required
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 08:05:30 +01:00
Juanjo Breso b480df069d Merge branch 'dev' into 5167-kk-warehouseAlias-y-warehouseJoined
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 06:50:40 +00:00
David Domenech b7bb1b9784 refs #6372 feat: vn2008 to vn
gitea/salix/pipeline/pr-dev Build queued... Details
2024-02-06 07:37:33 +01:00
David Domenech 0aed49d603 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6372-Delete-views-from-vn2008 2024-02-06 07:29:42 +01:00
Javi Gallego 990ab82461 Merge branch 'dev' into 6392-balance-produccion-propia 2024-02-06 07:26:35 +01:00
Javi Gallego 147721642b Merge branch 'dev' into 6749-disponible-sin-dar-vida
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 06:22:21 +00:00
Robert Ferrús e89240a8c7 Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-05 12:57:04 +00:00
Robert Ferrús 01512c7d36 feat: refs #6777 change dependecies vn2008 to vn
gitea/salix/pipeline/pr-dev Build queued... Details
2024-02-05 13:52:28 +01:00
Alex Moreno 691853df49 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-05 12:55:16 +01:00
Ivan Mas 9247a802bd refs #6665 delete unused views
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-05 12:21:11 +01:00
Guillermo Bonet 80aaaf3fc5 Merge branch 'dev' into 6778-changeViewDependencesVn2008
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-05 08:02:04 +00:00
Guillermo Bonet d28cacfbad refactor: refs #6778 Migrated views of vn2008 to vn
gitea/salix/pipeline/pr-dev Build queued... Details
2024-02-05 09:02:31 +01:00
Juanjo Breso 4a73bd0133 Merge branch 'dev' into 5167-kk-warehouseAlias-y-warehouseJoined
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-05 07:40:38 +00:00
Ivan Mas 1a869766b9 refs #6444 change code accord to conventions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-05 08:32:45 +01:00
Jorge Penadés 567359ad6a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-05 08:27:42 +01:00
Juanjo Breso f4591aae85 feat: refs #5167 Restaurar zoneEstimatedDelivery
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-05 08:07:12 +01:00
David Domenech 045dfa2aa1 Merge pull request 'test' (!1995) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1995
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-02-05 07:00:34 +00:00
Juanjo Breso 592e5c877f Merge branch 'dev' into 5167-kk-warehouseAlias-y-warehouseJoined
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-05 06:49:51 +00:00
Juanjo Breso 2ff7700088 Merge branch 'dev' into 6686-Limpieza-vistas-esquema-vn2008-part3
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-05 06:35:43 +00:00
David Domenech d2fec7beee refs #6642
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-05 07:30:04 +01:00
Jorge Penadés fde749de57 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-02 15:56:20 +01:00
Jorge Penadés 2a6dc0c478 fix: refs #4466 spaces
gitea/salix/pipeline/pr-dev Build queued... Details
2024-02-02 15:56:05 +01:00
Ivan Mas 0bd4602568 refs #6445 remove red function and modify precedures
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-02 15:50:16 +01:00
Juanjo Breso 0b3f77bb37 Merge branch 'dev' into 6686-Limpieza-vistas-esquema-vn2008-part3
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-02 13:38:30 +00:00
Juanjo Breso 518d057cf3 refs #6686 feat: Delete views vn2008
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-02 14:31:23 +01:00
Josep Domingo 1ffbb30d77 refs #6689 feat: delete view vn2008
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-02 14:05:27 +01:00
Jorge Penadés 743f317b20 fix: refs #4466 test & sql
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-02 14:02:16 +01:00
Robert Ferrús 6f5b03195b Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-02 12:08:09 +00:00
Guillermo Bonet bca15cc796 fix: refs #5483 Fix version
gitea/salix/pipeline/head This commit looks good Details
2024-02-02 13:03:59 +01:00
Javi Gallego 232f46be90 Merge branch 'dev' into 4515-addBuyCheck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-02 11:58:05 +00:00
Guillermo Bonet 7aea165fb7 Merge branch 'dev' into 6780-changeViewDependencesVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-02 11:17:32 +00:00
Pablo Natek 58daf4754b Merge branch 'dev' into 4515-addBuyCheck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-02 11:08:06 +00:00
Pablo Natek 2a29d68677 Merge pull request 'incluye fecha de ayer' (!1965) from 6752-edi.ekt_scan-improved into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1965
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-02-02 09:42:17 +00:00
Pablo Natek 1155c8d309 Merge branch 'dev' into 4515-addBuyCheck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-02 09:39:27 +00:00
Guillermo Bonet 35f047d4b9 Merge branch 'dev' into 6780-changeViewDependencesVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-02 09:04:59 +00:00
Alex Moreno d5e6750998 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-02 09:36:41 +01:00
Javi Gallego 6f4c0f655d feat: #6392 migrado de database 2024-02-02 08:05:17 +01:00
Juan Ferrer 837b9e6dea Merge branch 'dev' into 6752-edi.ekt_scan-improved
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-01 20:04:17 +00:00
Sergio De la torre 92169adac7 Merge branch 'dev' into 5802_setState
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-01 16:17:25 +00:00
Javi Gallego 9a084d225c Merge branch 'dev' into 6567-cambiar-articulos
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-01 14:34:10 +00:00
Ivan Mas 7b1a0e1957 refs #6444 change code according to sql conventions
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-01 13:02:03 +01:00
Robert Ferrús ff2328fd25 Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-01 11:56:10 +00:00
Guillermo Bonet 2ec7a43292 refactor: refs #6780 Changed dependences from vn2008 to vn 2024-02-01 09:49:44 +01:00
Sergio De la torre 39d07b3b59 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado 2024-02-01 09:28:08 +01:00
Robert Ferrús 512c1bdcc0 Merge branch 'dev' into 6688-deleteView2008Part5
gitea/salix/pipeline/pr-dev Something is wrong with the build of this commit Details
2024-02-01 07:54:25 +00:00
Guillermo Bonet 5d35519431 Merge branch 'dev' into 6692-viewClean9
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-01 07:29:55 +00:00
Robert Ferrús 805a7f65e7 Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1
gitea/salix/pipeline/pr-dev Something is wrong with the build of this commit Details
2024-02-01 07:20:07 +00:00
Guillermo Bonet 0b5395af2b Merge branch 'dev' into 6692-viewClean9
gitea/salix/pipeline/pr-dev Something is wrong with the build of this commit Details
2024-02-01 07:11:44 +00:00
Guillermo Bonet 386204926f Merge branch 'dev' into 6690-viewClean7
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-01 07:11:42 +00:00
Alex Moreno d338a04a27 Merge branch 'dev' into 6235-addDeviceWorkerTimeControl
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-01 06:35:51 +00:00
Robert Ferrús d3af5d6664 feat: refs #6688 delete view vn2008 part5 2024-02-01 07:14:02 +01:00
Robert Ferrús 2db7b608ad feat: refs #6371 2024-02-01 07:08:25 +01:00
Pablo Natek 650f85c737 Merge branch 'dev' into 4515-addBuyCheck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-01-31 13:57:44 +00:00
Pablo Natek 3182bfa46c refs #4515 2024-01-31 14:58:08 +01:00
David Domenech bad00167fa refs #6372 feat: vn2008 to vn 2024-01-31 14:50:56 +01:00
David Domenech a81a42c2e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6372-Delete-views-from-vn2008 2024-01-31 14:43:16 +01:00
Sergio De la torre 65a30224f5 Merge branch 'dev' into 5802_setState
gitea/salix/pipeline/pr-dev Something is wrong with the build of this commit Details
2024-01-31 11:33:09 +00:00
Guillermo Bonet 6ebf5f135a refactor: refs #6235 Deleted views and dependences 2024-01-31 12:14:24 +01:00
Pablo Natek b8b2e1c507 Merge branch 'dev' into 6752-edi.ekt_scan-improved
gitea/salix/pipeline/pr-dev Something is wrong with the build of this commit Details
2024-01-31 11:07:45 +00:00
Guillermo Bonet e0d15e572c Merge branch 'dev' into 6235-addDeviceWorkerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 10:13:57 +00:00
Robert Ferrús 8616b33c33 feat: refs #6691 delete view vn2008 part8
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 11:12:16 +01:00
Robert Ferrús 57c5c510ff Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 10:05:46 +00:00
Guillermo Bonet 2677bf953d Merge branch 'dev' into 6690-viewClean7
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 09:39:49 +00:00
Guillermo Bonet a42e20bd5f refactor: refs #6690 Deleted views and dependences 2024-01-31 10:35:50 +01:00
Juanjo Breso dc1ef34aba feat: refs #6493 refactorizar procedimientos vn2008 parte2
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-01-31 09:54:47 +01:00
Juanjo Breso 18772c04f6 feat: refs #5167 update
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-01-31 09:38:57 +01:00
Guillermo Bonet dd17b2c05d feat: refs #6235 Added device in clockIn 2024-01-31 09:04:30 +01:00
Javi Gallego a5e5a0d45d feat: #6749 se mira la vida para buscar dias en el pasado
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-01-31 09:03:08 +01:00
Juanjo Breso aba0d97106 feat: refs#5167 Update
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 09:00:43 +01:00
Sergio De la torre f88cef6745 refs #6186 feat:deprecated packingShelve 2024-01-31 08:45:52 +01:00
Sergio De la torre 4bf08ea147 refs #5890 feat:reserves
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 07:23:46 +01:00
Sergio De la torre 7f563f99bb refs #5890 feat:reserves
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 07:11:03 +01:00
Pablo Natek 7e7ab3e8b6 fix(triggers): refs #4515 fix error
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-30 15:07:13 +01:00
Ivan Mas da2a2b5f09 refs #6444 Remove vn2008.intrastat_neto function
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev Something is wrong with the build of this commit Details
2024-01-30 13:33:54 +01:00
Sergio De la torre a46c3c4d95 refs #5802 feat:ticket_setState
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-30 13:31:17 +01:00
Sergio De la torre 27f6621447 refs #5802 feat:ticket_setState 2024-01-30 13:29:49 +01:00
Pako Natek 1124722b25 nuevo commit de prueba
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-30 12:45:17 +01:00
Javi Gallego 4eb5efa2c9 feat: #6567 con varchar 2024-01-30 10:52:33 +01:00
Juanjo Breso 50c1531083 feat: refs#Eliminar vistas vn2008 2024-01-30 10:31:29 +01:00
Pako Natek 7cf46fc6cd incluye fecha de ayer
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-30 10:12:27 +01:00
Javi Gallego f0d4ae604b feat: #6567 sale_replaceItem adaptado a code 2024-01-30 10:03:21 +01:00
Ivan Mas ed0f942a57 refs #6444 create vn.intrastat_estimateNet.sql 2024-01-30 09:45:37 +01:00
Robert Ferrús 22fa1d4c3f Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1
gitea/salix/pipeline/head Build queued... Details
2024-01-30 09:23:16 +01:00
Robert Ferrús 05163bd5a7 feat: refs #6371 table vn2008 to vn
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-30 07:48:29 +01:00
Alex Moreno f4dc596e97 refs 5509 feat: add triggers, downloadFile
gitea/salix/pipeline/head This commit looks good Details
2024-01-29 15:13:56 +01:00
Robert Ferrús eb208edacc feat: refs #6371 pasar vn2008 a vn part1
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-29 12:35:49 +01:00
David Domenech 8ea3c98a13 refs #6372 feat: vn2008 to vn
gitea/salix/pipeline/head This commit looks good Details
2024-01-29 09:12:29 +01:00
Alex Moreno 149c2b0293 refs #5483 fix: zoneEstimatedDelivery in salix
gitea/salix/pipeline/head This commit looks good Details
2024-01-29 07:39:39 +01:00
Juan Ferrer 81639726b2 feat: refs #5483 final merge
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-26 00:09:24 +01:00
Juan Ferrer 1ad1e53970 feat: refs #5483 update db files
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-25 17:33:54 +01:00
Juan Ferrer b7edbbe12f feat: refs #5483 Copy vn-database project 2024-01-15 12:31:03 +01:00