Commit Graph

440 Commits

Author SHA1 Message Date
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
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 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
Sergio De la torre 1840117b3b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder 2024-03-25 16:08:11 +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
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
Sergio De la torre 61b649fdc5 refs #6964 feat:advice for olderItem
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-22 11:47:12 +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
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
Robert Ferrús 9795f449b9 Merge branch 'dev' into 6738-cleanTables2008Part2to2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-21 12:23:06 +00: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
Ivan Mas db71e69317 Merge branch 'dev' into 6827-check-usernames-special-characters
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-21 09:21:32 +00: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
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
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
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
Carlos Andrés 1315a854a9 fix: closeTicket idem salix Refs: #6549
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-18 18:15:05 +01:00
Carlos Andrés 913b261f86 Merge branch 'dev' into 6549-ticket_close
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-18 17:55:54 +01: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
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
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
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
Robert Ferrús 0f57931b3a Merge branch 'dev' into 6738-cleanTables2008Part2to2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 10:43:14 +00: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
Guillermo Bonet ad7b7be661 refs #6875 Fix version
gitea/salix/pipeline/head This commit looks good Details
2024-03-14 09:15:19 +01:00
Jorge Penadés 7a94ae3551 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 09:10:44 +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
Robert Ferrús 2d7110f05c Merge branch 'dev' into 6738-cleanTables2008Part2to2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 06:08:00 +00:00
Carlos Andrés 77d1a38a87 fix: closeTicket idem salix refs #6549
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-13 18:51:11 +01:00
Javier Segarra 4012b1756d refs #5858 add comment 2024-03-13 15:00:12 +01:00
Robert Ferrús 6163cad8a5 refs #6738
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-13 14:17:10 +01:00
Robert Ferrús fad30eb56d feat: refs #6738
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-13 14:08:14 +01:00
Guillermo Bonet 11dcb6e79f refactor: refs #6875 packing not null, negative or zero
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-13 13:45:57 +01:00
Robert Ferrús 2d9a106fab feat: refs #6738 premisos
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-13 12:59:45 +01:00
Robert Ferrús 0413707061 feat: refs #6738
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-13 12:50:27 +01:00
Carlos Andrés ff459ea3be fix: closeTicket idem salix refs #6549
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-13 12:18:43 +01:00
Javier Segarra 172e7566b5 refs #5858 perf: improve insert
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-13 11:58:25 +01:00
Guillermo Bonet cbaa48a933 Merge branch 'dev' into 6875-packingNotNull
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-13 10:56:17 +00:00
Javier Segarra 8276765225 refs #5858 perf: destinationFk to pepe
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-13 11:54:02 +01:00
Carlos Satorres f79d1320d8 Merge branch 'dev' into 6842-sageMod
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-13 10:29:07 +00:00
Robert Ferrús a6de9fd370 feat: refs #6738 modificar a nombres propuestos
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-13 07:19:06 +01:00
Jorge Penadés 9e596e6525 fix: refs #6492 file names
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-12 15:27:09 +01:00
Javier Segarra ff6a1a9111 refs #6930 perf: remove logoutMultimedia acl 2024-03-12 13:39:01 +01:00
Jorge Penadés 10c2d25cbd feat: refs #6492 create procedures & grant privileges
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-12 12:57:34 +01:00
Javier Segarra 486b51bcfa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6930_scopedToken_Multimedia 2024-03-12 12:46:46 +01:00
Robert Ferrús 9624cdce60 Merge branch 'dev' into 6738-cleanTables2008Part2to2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-12 11:25:56 +00:00
Sergio De la torre 9d94259d67 refs #6078 feat: workerActivity
gitea/salix/pipeline/pr-dev Build queued... Details
2024-03-12 12:21:46 +01:00
Javier Segarra e7f6e61ea1 refs #5858: change notification owner
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-12 10:20:43 +01:00
Sergio De la torre 375b690063 Merge branch 'dev' into 6078_workerActivty
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-12 09:12:45 +00:00
Javier Segarra 63a22a50f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions 2024-03-12 09:37:41 +01:00
Guillermo Bonet 819bc7a56d Merge pull request 'refactor: refs #6495 Migrated procs to vn' (!2108) from 6495-procRefactor4 into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2108
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-03-12 06:04:19 +00:00
Guillermo Bonet 516b4b364f Merge branch 'dev' into 6499-procRefactor6
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-11 13:36:34 +00:00
Javier Segarra 18773f34de Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-09 11:27:57 +01:00
Javier Segarra 4994a836c7 refs #5858 feat: alter table util.notification 2024-03-09 11:27:29 +01:00
Guillermo Bonet 1027ef6479 Merge branch 'dev' into 6495-procRefactor4
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-08 11:31:54 +00:00
Jorge Penadés 76c5595a58 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-08 11:01:25 +01:00
Alex Moreno 89c55d23a4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-08 08:11:30 +01:00
David Domenech 60c50337ff refs #6372
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-08 07:43:13 +01:00
David Domenech 014914e1d9 refs #6372 2024-03-08 07:36:14 +01:00
Jorge Penadés 1e3967a4fe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-07 15:56:02 +01:00
Carlos Satorres 557f1ec2d9 Merge branch 'dev' into 6842-sageMod
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-07 13:40:37 +00:00
Alex Moreno ed39ede6cc Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-07 10:35:14 +01:00
Alex Moreno fbdebad12c fix: refs #6995 desdeprecar unary_scan, unary_scan_line, unary_scan_line_buy, unary_scan_line_expedition
gitea/salix/pipeline/head This commit looks good Details
2024-03-07 10:29:31 +01:00
Alex Moreno 00355aba3a fix: refs #6995 desdeprecar unary y unary_scan
gitea/salix/pipeline/head This commit looks good Details
2024-03-07 10:24:18 +01:00
Alex Moreno b8f09f363f fix: refs #6995 restore vn2008.jerarquia
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-07 09:33:32 +01:00
Alex Moreno a8c2779ee7 Merge branch 'master' into 6995-testToMaster_2410
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-07 06:22:04 +00:00
Sergio De la torre 69ad44c0bd Merge branch 'dev' into 6078_workerActivty
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-07 07:18:16 +01:00
Guillermo Bonet 39b4e5db28 Merge branch 'dev' into 6948-bank
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-07 06:17:26 +00:00
Guillermo Bonet ee08502f33 Merge branch 'dev' into 6495-procRefactor4
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-07 06:07:54 +00:00
Guillermo Bonet cd40bd47e5 refactor: refs #6495 Deleted procs
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-07 07:08:40 +01:00
Javier Segarra 6c06f70121 Merge branch 'dev' into 6930_scopedToken_Multimedia
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 18:18:34 +00:00
Carlos Andrés f1654609df Merge pull request 'test' (!2142) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2142
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>
2024-03-06 16:16:16 +00:00
Carlos Andrés fc3c9332b3 Merge pull request 'master' (!2141) from master into test
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2141
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-03-06 16:10:42 +00:00
Carlos Andrés c81749da78 feat: add column department.pbxQueue refs #6387
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-06 16:38:34 +01:00
Carlos Satorres 58a239708d refs #6842 remove sage
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-06 13:11:41 +01:00
Carlos Satorres 59a0cb3f4a refs #6842 deprecated and move
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-06 13:08:20 +01:00
Javier Segarra 7999a9bf93 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 11:42:09 +01:00
Javier Segarra eb5fdd1940 refs 5858 feat: replace with code 2024-03-06 11:41:48 +01:00
Guillermo Bonet 094c00aabd Merge branch 'dev' into 6495-procRefactor4
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 10:17:45 +00:00
Jorge Penadés f600a99708 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2024-03-06 10:55:05 +01:00
Alex Moreno 31dc2db838 Merge branch 'dev' into 6336-claimState_removeSome
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 08:08:25 +00:00
Ivan Mas 354ecfaa16 refs #6498 Arreglar grant y tabs
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 09:00:21 +01:00
Robert Ferrús b353924034 Merge branch 'dev' into 6738-cleanTables2008Part2to2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 13:49:57 +00:00
Ivan Mas f215ce5f05 refs #6498 Delete procedures vn2008 and grant vn procs
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 14:33:16 +01:00
Robert Ferrús 5f16a9827c feat: refs #6738 move file version
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 14:17:58 +01:00
Robert Ferrús 1580914567 Merge branch 'dev' into 6738-cleanTables2008Part2to2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 12:23:23 +00:00
Pako Natek 9c14836bc7 BlueMonkey
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-05 13:18:13 +01:00