Commit Graph

4181 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Robert Ferrús 6163cad8a5 refs #6738
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-13 14:17:10 +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
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
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
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
Carlos Satorres 41fbae7eec Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6755-restoreRefactor
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-13 13:37:38 +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
Sergio De la torre b4fe00a028 Merge branch 'dev' into 6078_workerActivty
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-13 11:36:59 +00: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
Guillermo Bonet 14571ed10f Merge branch 'dev' into 7018-procMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-13 09:39:55 +00:00
Robert Ferrús 786eb08779 Merge branch 'dev' into 6738-cleanTables2008Part2to2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-13 07:07:42 +00:00
Guillermo Bonet b5f3753253 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-13 07:42:51 +01:00
Guillermo Bonet 319bf314b3 hotfix: itemProposal
gitea/salix/pipeline/head This commit looks good Details
2024-03-13 07:38:14 +01: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
Javier Segarra ff6a1a9111 refs #6930 perf: remove logoutMultimedia acl 2024-03-12 13:39:01 +01:00
Carlos Satorres 106296be7b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6755-restoreRefactor
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-12 12:55:56 +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 c1d0ea7e27 refs #5858: breaklines
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-12 09:40:42 +01: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
Jorge Penadés 5531639027 feat: refs #6951 create procedure
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-12 09:34:12 +01:00
Guillermo Bonet 1d398a0acf refactor: refs #7018 Added comment and minor changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-12 08:40:11 +01:00
Guillermo Bonet e2eddbaef7 refactor: refs #7018 Added comment
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-12 08:35:13 +01:00
Guillermo Bonet 1bcb61a224 refactor: refs #7018 Mirated procs to vn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-12 08:25:58 +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
Guillermo Bonet adafab5847 refactor: refs #6874 item_getSimilar
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-11 13:27:18 +01:00
Guillermo Bonet 552a1a33c2 hotfix: itemProposal
gitea/salix/pipeline/head This commit looks good Details
2024-03-11 12:38:52 +01:00
Guillermo Bonet a34be6ca02 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-11 12:21:54 +01:00
Robert Ferrús 9910ae5c64 fix: refs #6610 quitar variable
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-11 12:12:02 +01:00
Carlos Satorres 35c5e127d4 Merge branch '6842-sageMod' of https://gitea.verdnatura.es/verdnatura/salix into 6842-sageMod
gitea/salix/pipeline/pr-dev Build queued... Details
2024-03-11 09:48:36 +01:00
Carlos Satorres b051b0512f refs #6842 fix fixtures 2024-03-11 09:48:29 +01:00
Jorge Penadés e5387b0b65 fix: refs #5186 use date function
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-11 09:14:05 +01:00
Jorge Penadés 4e8e7d3f4b 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-11 08:59:26 +01:00
Alex Moreno dcdad9c469 Merge branch 'dev' into 6925-invoice-transaction
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-11 06:05:50 +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
Robert Ferrús b6af349d89 Merge branch '6610-hotFixDeleteTicketsWeekly' of https://gitea.verdnatura.es/verdnatura/salix into 6610-hotFixDeleteTicketsWeekly
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-08 12:32:25 +01:00
Robert Ferrús b1e90fabb2 refs #6610 2024-03-08 12:32:22 +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
Robert Ferrús 05b60150a0 Merge branch 'master' into 6610-hotFixDeleteTicketsWeekly
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-08 11:20:07 +00:00
Robert Ferrús cdb9f372cf feat: refs #6610 fixDeleteTickets
gitea/salix/pipeline/pr-master Build queued... Details
2024-03-08 12:19:57 +01: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
Guillermo Bonet 74c199384c fix: refs #6372 vn2008.clean
gitea/salix/pipeline/head This commit looks good Details
2024-03-08 10:42:07 +01:00
Guillermo Bonet 37e8518242 feat: refs #6372 Added saleLabel to vn.clean
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-08 10:38:35 +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
Pako Natek b588b9807c fixtures local
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-07 13:45:53 +01:00
Alex Moreno 2f2aba1cc8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6925-invoice-transaction 2024-03-07 11:42:35 +01: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 f29212cb65 deploy: refs #6995 production dump
gitea/salix/pipeline/head This commit looks good Details
2024-03-07 10:34:24 +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 3bfaa97ddd fix: refs #6995remove preparation_exception
gitea/salix/pipeline/head This commit looks good Details
2024-03-07 10:18:30 +01:00
Alex Moreno 99c9ad77d2 fix: refs #6995 restore vn.exchangeInsuranceInPrevious
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-07 10:07:42 +01:00
Alex Moreno 572a09f704 fix: refs #6995 restore vn.exchangeInsuranceInPrevious
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-07 09:55:29 +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
Carlos Satorres 64d82d92d6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6755-restoreRefactor 2024-03-07 09:28:32 +01:00
Robert Ferrús bf9842d5fd Merge branch 'master' into rutasAnalyzeHotFix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-07 07:16:11 +00: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
Robert Ferrús 29926db45f Merge branch 'master' into rutasAnalyzeHotFix
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-07 06:01:37 +00: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
Sergio De la torre dc6cfafd05 Merge branch 'dev' into 6607_checking_boxes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 16:03:24 +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
Ivan Mas 6b2533cfb1 refs #6498 correccion errores 2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 15:16:55 +01:00
Carlos Satorres a14ab90d5a refs #6755 fix restore add fixtures 2024-03-06 14:41:58 +01:00
Alex Moreno 9ab0228714 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6925-invoice-transaction 2024-03-06 13:58:10 +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 6a13a33f84 min c
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-06 13:09:41 +01:00
Carlos Satorres a24445439a remove v
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-06 13:09:03 +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
Ivan Mas 492c6f4dd6 refs #6969 test
gitea/salix/pipeline/pr-test This commit looks good Details
2024-03-06 12:50:44 +01:00
Ivan Mas 7947d6644e refs #6498 Correcion errores
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 12:44:59 +01:00
Sergio De la torre 49800a5cab Merge branch 'dev' into 6607_checking_boxes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 11:36:05 +00:00
Sergio De la torre 010f585ed4 Merge branch 'dev' into 6193_inventory
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 11:33:34 +00: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
Javier Segarra 2f0c8d96d2 refs 5858 fix: resolve breaklines 2024-03-06 11:41:25 +01:00
Jorge Penadés 50a1d5b5ab Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 11:31:02 +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
Ivan Mas 3cb45dd57b Merge branch 'test' into 6969-Error_packaging-buyUltimateFromInterval
gitea/salix/pipeline/pr-test Build queued... Details
2024-03-06 10:08:50 +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
Sergio De la torre 5e6c4b21ba Merge branch 'dev' into 6193_inventory
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 09:44:07 +00:00
Sergio De la torre 922d106bbd Merge branch 'dev' into 6607_checking_boxes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 09:43:39 +00:00
David Domenech 57c7f4d391 Merge branch 'dev' into 6874-item_getSimilar
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 09:30:28 +00: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
Guillermo Bonet 4e28c315f7 Merge branch 'dev' into 6874-item_getSimilar
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-06 06:14:13 +00:00
Carlos Andrés 66b7a3e8f5 feat: restricciones AWB para travel y entry refs #6960
gitea/salix/pipeline/pr-master This commit looks good Details
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-03-05 17:30:29 +01:00
Sergio De la torre 34572112ec Merge branch 'dev' into 6193_inventory
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 15:21:16 +00:00
Sergio De la torre 2d5aae3b40 Merge branch 'dev' into 6607_checking_boxes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 15:11:14 +00:00
Sergio De la torre d397980efb refs #6607 feat:[checking boxes]
gitea/salix/pipeline/pr-dev Build queued... Details
2024-03-05 16:10:56 +01:00
Guillermo Bonet f601c12468 refactor: refs #6948 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-05 15:02:09 +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
Ivan Mas 68846d3018 refs #6499 Refactor historico_multiple
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-05 13:43:03 +01:00
Robert Ferrús 9992a8b4ff Merge branch 'master' into rutasAnalyzeHotFix
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-05 12:23:38 +00: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
Guillermo Bonet 950d7a2461 refactor: refs #6874 Changed params item_getSimilar
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-05 12:48:39 +01:00
Guillermo Bonet 00d5d06c6a Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-05 12:38:15 +01:00
Guillermo Bonet 85d3508848 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-03-05 12:37:06 +01:00
Guillermo Bonet d2f451c613 ticket #162561 hotfix
gitea/salix/pipeline/head This commit looks good Details
2024-03-05 12:33:28 +01:00
Sergio De la torre cf181521d6 refs #6078 feat:add workeractivity
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 11:53:57 +01:00
Sergio De la torre 726558d5a7 refs #6607 feat:[checking boxes]
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 10:37:15 +01:00
Guillermo Bonet 55ba315858 refactor: refs #6948 Bank to Accouting
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-05 10:30:25 +01:00
Guillermo Bonet e0732835d0 refactor: refs #6948 Bank to Accouting
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-05 10:25:23 +01:00
Jorge Penadés 0aa4add71b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 10:11:41 +01:00
Robert Ferrús d668ae9904 refs #6738
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 09:34:30 +01:00
Robert Ferrús dc343a7e3b feat: refs #6738 delete vn2008.dock
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 09:33:48 +01:00
Guillermo Bonet ab4d1a0437 Merge branch 'dev' into 6495-procRefactor4
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 07:54:40 +00:00
Guillermo Bonet 619ac4e053 refactor: refs #6495 Requested changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 08:55:40 +01:00
Robert Ferrús 0c9e11c0b2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6738-cleanTables2008Part2to2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 08:40:34 +01:00
Robert Ferrús 9a0b4ef674 feat: refs #6738 change table vn2008 to vn
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 08:36:19 +01:00
Guillermo Bonet 05380df4f8 Merge pull request 'refactor: refs #6874 Proc itemProposal' (!2123) from 6874-itemProposalRefactor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2123
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-03-05 06:35:04 +00:00
Robert Ferrús c9b6cbf67b fix: vDatedFrom y vDatedTo
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-05 07:15:38 +01:00
Guillermo Bonet 489d126f79 Merge branch 'dev' into 6494-procRefactor3
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-04 13:44:47 +00:00
Alex Moreno 5e794a7791 Merge branch 'dev' into 6336-claimState_removeSome
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-04 13:15:50 +00:00
Alex Moreno b761c258a1 refs #6336 feat(claimState): delete without using 2024-03-04 14:12:56 +01:00
Guillermo Bonet 2c7913a3be Merge branch 'dev' into 6499-procRefactor7
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-04 12:41:50 +00:00
Guillermo Bonet fa70eeb75c refactor: refs #6499 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-04 13:42:11 +01:00
Guillermo Bonet e65fc06a30 Merge branch 'dev' into 6494-procRefactor3
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-04 12:33:49 +00:00
Guillermo Bonet a96743c3b9 refactor: refs #6494 Requested changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-04 13:34:42 +01:00
Guillermo Bonet cf810fe497 refactor: refs #6874 Proc itemProposal
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-04 13:14:41 +01:00
Guillermo Bonet 24efc1dd28 Merge branch 'dev' into 6874-itemProposalRefactor
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-04 11:43:36 +00:00
Javier Segarra 753525d0ac 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-04 11:57:16 +01:00
Javier Segarra 78c92af02f refs #5858 feat: fix vn file 2024-03-04 11:57:10 +01:00
Robert Ferrús 5175c91b2d fix: quitar delete
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-04 11:51:55 +01:00
Jorge Penadés 9cff06ae3d feat: refs #6276 acl itemBarcode delete
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-04 09:30:07 +01:00
Ivan Mas bd5d88f5ef refs #6969 Error packaging
gitea/salix/pipeline/pr-test This commit looks good Details
2024-03-04 08:41:09 +01:00