Commit Graph

6126 Commits

Author SHA1 Message Date
Sergio De la torre bebd49f08a fix: debugAdd refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-11 07:08:36 +02:00
Javier Segarra f487aed336 Merge branch 'dev' into 5938_fine_ticketAdvance
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-10 14:16:56 +00:00
Jorge Penadés 85c50db19e Merge branch 'dev' into 4074-useAcls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-10 11:45:09 +00:00
Carlos Andrés 8fd7c1a8dd fix: refs #7213 change rounding problems
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-10 13:16:15 +02:00
Carlos Andrés 0bbf10ca4f fix: refs #7213 change rounding problems
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-09-10 12:59:07 +02:00
Guillermo Bonet 01d591af53 fix: refs #7564 Deleted query
gitea/salix/pipeline/head This commit looks good Details
2024-09-10 12:58:16 +02:00
Jorge Penadés e2ef3472b5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-10 09:41:46 +02:00
Alex Moreno e74da7cbab feat: refs #7953 pullinfo
gitea/salix/pipeline/pr-test This commit looks good Details
2024-09-10 08:17:47 +02:00
Jon Elias 9759715609 fix: refs #6346 created test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-10 07:52:09 +02:00
Jon Elias 0593ea9a30 Merge branch '6346-FixWagonModule' of https://gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-10 07:50:42 +02:00
Jon Elias 125c0c9b3b refactor: refs #6346 requested changes 2024-09-10 07:50:40 +02:00
Javier Segarra c407dde7a0 feat(salix): refs #6156 #6156 remove redundant condition 2024-09-09 15:14:01 +02:00
Jorge Penadés 579ac481f3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4074-useAcls
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-09 15:13:52 +02:00
Javier Segarra 615f57b2e6 feat(salix): refs #6156 #6156 simplify CONCAT_WS 2024-09-09 15:13:32 +02:00
Javier Segarra f9a25617f0 feat(salix): refs #6156 #6156 add missing values 2024-09-09 15:13:08 +02:00
Javier Segarra f70f475223 feat(salix): refs #6156 #6156 change user definer 2024-09-09 15:12:44 +02:00
Javier Segarra 773933ca3c feat(salix): refs #6156 #6156 change config sql 2024-09-09 15:11:55 +02:00
Javier Segarra a5f6fe95ea feat(salix): refs #5938 #5938 add futureAlertLevel
gitea/salix/pipeline/pr-dev Build queued... Details
2024-09-09 14:58:02 +02:00
Guillermo Bonet bf1a43a23e refactor: refs #7900 Deleted sectorProdPriority column
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 14:43:16 +02:00
Guillermo Bonet 946806c98e Merge branch 'test' into dev 2024-09-09 14:25:51 +02:00
Javier Segarra 38ee76f7c9 Merge branch 'dev' into 6156-advanceTicketsNewField 2024-09-09 12:20:02 +00:00
Jorge Penadés 6e511f00c0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4074-useAcls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 13:58:46 +02:00
Javier Segarra 2fef104954 Merge branch 'dev' into 6156-advanceTicketsNewField 2024-09-09 10:48:20 +00:00
Alex Moreno 0949112b13 Merge branch 'dev' of https: refs #7547//gitea.verdnatura.es/verdnatura/salix into 7547-accessToken-security
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 12:42:13 +02:00
Carlos Andrés 88a8b4975b fix: ticket 218504 ticket_close
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-09 12:37:49 +02:00
Javier Segarra 31b04cba75 feat(salix): refs #6156 #6156 Move to myt version 2024-09-09 12:08:12 +02:00
Guillermo Bonet daf3dfd2ee Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-09 11:35:28 +02:00
Javier Segarra 378ee1119f Merge branch 'dev' of https: refs #6156//gitea.verdnatura.es/verdnatura/salix into 6156-advanceTicketsNewField 2024-09-09 10:18:10 +02:00
Jon Elias c93275b62d Merge branch 'dev' into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 08:06:04 +00:00
Jorge Penadés 18ec76d156 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4074-useAcls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 10:03:22 +02:00
Guillermo Bonet 261bebbc3b feat: refs #6727 Deleted duplicated indexes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 09:41:40 +02:00
Guillermo Bonet 56eb3e093d feat: refs #6727 Added indexes in creationDate
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-09 09:39:10 +02:00
Guillermo Bonet 7053f2786a Merge branch 'dev' into 6727-logClean 2024-09-09 09:38:40 +02:00
Guillermo Bonet c4527cc5c5 feat: refs #4515 New throw buy_checkItem
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 08:28:27 +02:00
Jon Elias b3aa263cea Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 07:32:11 +02:00
Juan Ferrer 37fabc38bd fix(hedera): refs #7931 PROC order_addItem NULL available fix, translations added
gitea/salix/pipeline/pr-test This commit looks good Details
2024-09-06 14:56:14 +02:00
Jorge Penadés c43c61991d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4074-useAcls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 14:22:57 +02:00
Jorge Penadés 901cdc7117 feat: refs #4074 modify acls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 14:18:15 +02:00
Jorge Penadés b277ae2d92 Merge branch 'dev' into 7323-dynamicRole
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 12:01:18 +00:00
Guillermo Bonet a718b6e81f Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-06 13:52:10 +02:00
Guillermo Bonet 5a82ce4aae Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-09-06 13:51:13 +02:00
Carlos Andrés d10db686e5 fix: refs #7346 ticket_close serial
gitea/salix/pipeline/head This commit looks good Details
2024-09-06 12:52:24 +02:00
Ivan Mas 762975ed14 Merge branch 'dev' into 7898-New_column_floor_parking
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 09:54:34 +00:00
Ivan Mas d9c860c44a Merge branch 'dev' into 7747-DeleteBuyUltimateAndBuyUltimateFromInterval
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 09:48:58 +00:00
Jorge Penadés 26d47b3f38 Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 11:29:53 +02:00
Jorge Penadés af929c1ee9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-dynamicRole
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 10:45:35 +02:00
Jorge Penadés 2df9bb9bdb Merge branch 'dev' into 7524-addFixture
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 08:42:53 +00:00
Jorge Penadés 18d93d93a6 chore: refs #7323 worker changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 10:40:16 +02:00
Jorge Penadés 0a7a9e2cc8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-dynamicRole
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 10:29:44 +02:00
Ivan Mas 900e840eec Merge branch 'dev' into 7819-Delete_obsolete_objects
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 07:43:06 +00:00
Juan Ferrer 93330db88f Merge branch 'test' into 7931-availableFix
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-09-06 07:14:08 +00:00
Jorge Penadés 78a851336f chore: refs #7323 worker changes wip
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 09:11:20 +02:00
Juan Ferrer 640b45ed99 fix: refs #7931 Apply PR change requests
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-09-06 09:06:00 +02:00
Ivan Mas 26db88b344 Merge branch 'dev' into 7898-New_column_floor_parking
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 07:00:19 +00:00
Ivan Mas 0626b83370 Merge branch 'dev' into 7747-DeleteBuyUltimateAndBuyUltimateFromInterval
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 06:56:15 +00:00
Ivan Mas 747e6a562a feat: refs #7747 Delete buyUltimate and buyUltimateFromInterval
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 08:51:41 +02:00
Guillermo Bonet 1b8583a19d feat: refs #7759 Revoke routine grants vn
gitea/salix/pipeline/head This commit looks good Details
2024-09-06 08:50:50 +02:00
Ivan Mas f193938264 Merge branch 'dev' into 7898-New_column_floor_parking
gitea/salix/pipeline/pr-dev Build queued... Details
2024-09-06 06:02:01 +00:00
Guillermo Bonet 925002256a Merge branch 'dev' into 7562-deleteDeprecatedObjects
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 05:49:20 +00:00
Guillermo Bonet 7486c4a3c6 feat: refs #7562 refs #7532 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 07:48:53 +02:00
Robert Ferrús 75146f930a Merge branch 'master' into 7929-createTableMaterial
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-06 04:28:11 +00:00
Guillermo Bonet 72024fb854 fix: refs #7759 Added user 'vn'@'localhost' & grants
gitea/salix/pipeline/head This commit looks good Details
2024-09-06 06:12:48 +02:00
Ivan Mas ac8b101455 feat: refs #7898 Modify default
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-05 17:05:48 +02:00
Jorge Penadés cff5bef54b fix: refs #7524 add fixture orm config
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-05 15:47:45 +02:00
Juan Ferrer a7bc58a5bc fix: refs #7931 Immediately discount order lines from available
gitea/salix/pipeline/pr-test This commit looks good Details
2024-09-05 14:45:17 +02:00
Robert Ferrús 5e456a32fb Merge branch '7929-createTableMaterial' of https://gitea.verdnatura.es/verdnatura/salix into 7929-createTableMaterial
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-05 14:38:58 +02:00
Robert Ferrús 3e4caa8edf feat: refs #7929 autoincrement 1 2024-09-05 14:38:55 +02:00
Robert Ferrús fa34c4328e Merge branch 'master' into 7929-createTableMaterial
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-05 12:27:41 +00:00
Robert Ferrús 684658bb96 feat: refs #7929 quitar codigo 2024-09-05 14:25:50 +02:00
Jorge Penadés 4869322476 Merge branch 'dev' into 7524-addFixture
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-05 09:57:26 +00:00
Guillermo Bonet 620ce5d45e Merge pull request 'feat: refs #7905 getBuysCsv' (!2900) from 7905-getBuysCsv into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2900
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-09-05 09:44:38 +00:00
Guillermo Bonet 5a51d5c07b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Build queued... Details
2024-09-05 11:19:02 +02:00
Guillermo Bonet ac01da5eed feat: refs #7759 Deleted version 11163-maroonEucalyptus 2024-09-05 11:19:00 +02:00
Javi Gallego 40a1b24403 Merge pull request '#7277 - RefundInvoices' (!2904) from 7277-RefundInvoices into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2904
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-09-05 09:07:24 +00:00
Javier Segarra bb401af086 Merge branch 'dev' into 7524-addFixture
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-05 09:00:14 +00:00
Guillermo Bonet 8ca491b8de Merge branch 'dev' into 7759-newDefiner
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-05 09:40:42 +02:00
Jorge Penadés e98313a1a5 Merge branch 'dev' into 7524-addFixture
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-05 07:37:56 +00:00
Guillermo Bonet d0eab064b7 Merge branch 'dev' into 7905-getBuysCsv
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-05 07:26:27 +00:00
Guillermo Bonet 6df817ea5d Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-05 09:25:00 +02:00
Guillermo Bonet 2b465d0d23 Merge branch 'dev' into 7905-getBuysCsv
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-05 07:18:37 +00:00
Jorge Penadés 03d711b694 chore: refs #7524 add select limit
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-05 09:12:52 +02:00
Robert Ferrús 777eba8c53 Merge branch 'master' into ticket216260-buy_recalcPrices
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-05 05:22:02 +00:00
Carlos Satorres b66386fdb1 Merge pull request 'refs #7407 create models' (!2603) from 7407-workerMedical into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2603
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-09-04 13:07:50 +00:00
Robert Ferrús 75be124e1f feat: refs #7929 create table material
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-04 14:14:12 +02:00
Guillermo Bonet 2bb73af47d Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-04 14:12:50 +02:00
Guillermo Bonet 80839100c7 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-09-04 14:10:33 +02:00
Guillermo Bonet 212e8d1a03 fix: refs #7346 invoiceSerial 2024-09-04 14:09:31 +02:00
Pako Natek e574f0060a hotfix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-04 13:37:13 +02:00
Guillermo Bonet afcb590a9e fix: ticket #216260 buy_recalcPrices
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-04 12:45:33 +02:00
Guillermo Bonet 297eb30395 fix: ticket #216260 buy_recalcPrices 2024-09-04 12:41:44 +02:00
Guillermo Bonet 74a5d1f217 fix: ticket #216260 buy_recalcPrices
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-04 12:23:01 +02:00
Jorge Penadés 544ddb0f15 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-04 10:39:46 +02:00
Guillermo Bonet fbfbcf9bd4 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-04 09:02:57 +02:00
Guillermo Bonet a8cc3f496f build: refs #7897 dump 24.36
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-09-04 09:02:38 +02:00
Guillermo Bonet c5521ea021 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-04 07:06:22 +02:00
Jorge Penadés a07582faa4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-03 16:22:04 +02:00
Javier Segarra d54361a0bc Merge branch 'dev' into 7277-RefundInvoices
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-03 13:38:03 +00:00
Guillermo Bonet 3cc19549e4 fix: refs #7844 salesFilter and tmp.ticket_problems.totalProblems
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-09-03 15:03:09 +02:00
Ivan Mas 77fd3e7f46 feat: refs #7898 Add column "floor" in vn.parking
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-03 14:42:07 +02:00
Jon Elias 26876fd0a6 Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-03 14:35:59 +02:00