Commit Graph

1534 Commits

Author SHA1 Message Date
Javier Segarra 4689681618 fix(salix): add administrative ACLs
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-23 12:07:06 +02:00
Jorge Penadés 8ff0dc06fe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-23 09:29:51 +02:00
Robert Ferrús e0e3201f78 Merge branch 'master' into 8000-catalog_calculate
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-23 05:37:43 +00:00
Ivan Mas 06f8f8e95e refactor: refs #7725 deprecate worker.isF11Allowed
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-22 08:39:19 +02:00
Ivan Mas 0bf2935c23 Merge branch 'dev' into 7994-UpdateSale.OriginalQuantity
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-22 05:29:26 +00:00
Ivan Mas 753f6d7866 feat: refs #7994 add schema
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-22 07:27:43 +02:00
Ivan Mas 1ec8d8d5a0 feat: refs #7994 update sale.originalQuantity
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-22 07:24:21 +02:00
Carlos Satorres 346893455f fix: remove comment
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-20 13:38:53 +02:00
Carlos Satorres 564d23653c fix: acls
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-20 13:24:00 +02:00
Robert Ferrús 3bdd196fcc Merge branch 'master' into 8000-catalog_calculate
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-20 08:38:12 +00:00
Robert Ferrús a65700abed feat: refs #8000 modificar comentario
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-20 10:37:36 +02:00
Pako Natek e9b93ff99b Merge branch 'dev' into 7999-longTermStorage
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-20 08:13:52 +00:00
Pako Natek e8add6e614 feat(TPV): refs #7999 new frmLongTermStorage
gitea/salix/pipeline/pr-dev This commit looks good Details
Parking table foreign key updated
Old proc removed

Refs: #7999
2024-09-20 10:12:24 +02:00
Carlos Andrés 1a44d23239 Merge branch 'master' into solve_merge_problems
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-20 08:59:58 +02:00
Robert Ferrús 1b4a324c3c feat: refs #8000 modificar comentarios
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-20 07:58:15 +02:00
Robert Ferrús f50b8326ba Merge branch '8000-catalog_calculate' of https://gitea.verdnatura.es/verdnatura/salix into 8000-catalog_calculate
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-20 07:33:08 +02:00
Robert Ferrús 0c35e1fa9c feat: refs #8000 modificar comentario 2024-09-20 07:33:05 +02:00
Robert Ferrús e75ac1bb8d Merge branch 'master' into 8000-catalog_calculate
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-20 04:58:51 +00:00
Alex Moreno ccb60eee87 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-09-19 12:42:12 +02:00
Alex Moreno b7e712b738 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-09-19 12:38:08 +02:00
Robert Ferrús 5456490dcd feat: refs #8000 poner comentario
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-19 12:09:47 +02:00
Jorge Penadés 22af34c0cb feat: refs #7323 use scopes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-19 09:27:05 +02:00
Robert Ferrús b48c221028 feat: refs #8000 refs #800 catalog_calculate itemMaxLength
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-19 08:33:33 +02:00
Jorge Penadés a6168e61f1 refactor: refs #7323 improve role resolver
gitea/salix/pipeline/pr-master Build queued... Details
2024-09-18 12:19:49 +02:00
Carlos Satorres 5da6c09f68 fix: refs #7529 workerPit
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-18 12:08:49 +02:00
Carlos Andrés dcd7237d67 Merge branch 'master' into solve_merge_problems
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-09-18 10:17:57 +02:00
Jorge Penadés c0c8548216 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-18 09:41:40 +02:00
Carlos Satorres c0ee82fd4f Merge branch 'dev' of https: refs #7529//gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-18 07:56:03 +02:00
Guillermo Bonet 7f9cd1e0d9 Merge pull request 'feat: refs #7893 Created waste_addSalesLauncher' (!2972) from 7893-waste_addSales into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2972
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-18 05:40:17 +00:00
Guillermo Bonet 91ee956fbd Merge pull request 'feat: refs #7882 Added model and method' (!2879) from 7882-quadMinds into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2879
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-18 05:16:45 +00:00
Guillermo Bonet 871d5457d0 refactor: refs #7882 Requested changes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-18 07:14:52 +02:00
Jorge Penadés 75b7e603c9 fix: refs #7323 drop acl
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-17 16:08:51 +02:00
Carlos Andrés 8f9a7802ab fix: refs #7760 tmp.ticketIPT
gitea/salix/pipeline/head This commit looks good Details
2024-09-17 15:50:51 +02:00
Pablo Natek ad6fcc0d36 Merge branch 'dev' into 7404-stockBuyed
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-17 11:57:54 +00:00
Guillermo Bonet a3022a7379 Merge branch 'dev' into 7893-waste_addSales
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-17 10:35:27 +00:00
Guillermo Bonet fa5ace677c refactor: refs #7893 Requested changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-17 12:35:08 +02:00
Guillermo Bonet be30e5ae1f Merge branch 'dev' into 7817-isChecked
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-17 10:30:29 +00:00
Pako Natek 019d855fbf fix: refs #7969 new plantTray restriction 2024-09-17 11:22:07 +02:00
Jon Elias eb083d6d2b Merge branch 'dev' into 6346-WagonToCard
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-17 09:07:26 +00:00
Jon Elias c8315714d4 Merge branch 'dev' into Hotfix-WagonSQL
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-17 09:05:17 +00:00
Pablo Natek d308f185bc Merge branch 'dev' into 7404-stockBuyed
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-17 08:11:17 +00:00
Alex Moreno cabc9660d6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-16 14:27:08 +02:00
Alex Moreno 8803ae0534 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-09-16 14:25:27 +02:00
Guillermo Bonet 51da7ae063 feat: refs #7893 Created waste_addSalesLauncher
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 13:33:53 +02:00
Jon Elias 3aebe88593 Merge branch 'dev' into 6346-WagonToCard
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 11:04:27 +00:00
Jon Elias 9aff118b6e feat: refs #6346 added script for wagons
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 13:00:11 +02:00
Guillermo Bonet 0d7953a869 Merge branch 'dev' into 7912-wasteChanges
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 10:33:23 +00:00
Guillermo Bonet 5c7a537275 feat: refs #7912 Added new waste types
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 12:32:52 +02:00
Jorge Penadés 0a0701f7c2 Merge branch 'dev' into 7828-makeCorrectCalls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 10:24:36 +00:00
Pablo Natek 88962b051f Merge branch 'dev' into 7404-stockBuyed
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 10:13:13 +00:00
Guillermo Bonet 51cabd06a4 refactor: refs #7562 Deleted deprecated objects
gitea/salix/pipeline/head This commit looks good Details
2024-09-16 10:44:04 +02:00
Guillermo Bonet d7e7647b52 Merge branch 'dev' into 7817-isChecked
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 09:17:20 +02:00
Pablo Natek 8f4f2d2d15 Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-16 09:06:04 +02:00
Jon Elias 8b7beb7247 Merge branch 'dev' into Hotfix-WagonSQL
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 06:20:16 +00:00
Pako Natek 6cbf25dee5 fix: refs #7969 fix on collectionNew
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-09-16 08:10:58 +02:00
Guillermo Bonet 63dde3dd78 fix: refs #7819 Version
gitea/salix/pipeline/head This commit looks good Details
2024-09-13 14:13:14 +02:00
Ivan Mas dc5691fce7 Merge branch 'dev' into 7819-Delete_obsolete_objects
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-13 11:49:28 +00:00
Jon Elias 8d050a8e08 Merge branch 'dev' into Hotfix-WagonSQL
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-13 11:07:55 +00:00
Jorge Penadés b083b267b2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-13 11:59:51 +02:00
Jorge Penadés cfbc3692e9 feat: refs #7874 clientObservationType
gitea/salix/pipeline/pr-dev Build queued... Details
2024-09-13 11:59:28 +02:00
Sergio De la torre 11193bebe6 Merge pull request '6868_createLogin' (!2598) from 6868_createLogin into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2598
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-13 09:43:31 +00:00
Jon Elias f1f0f5920c fix: refs #6346 fixed SQL
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-13 11:29:05 +02:00
Jorge Penadés 2dc55a706c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7828-makeCorrectCalls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-13 09:20:57 +02:00
Alex Moreno bbb3889154 fix: sql wagonTypeTray
gitea/salix/pipeline/head This commit looks good Details
2024-09-13 08:54:03 +02:00
Alex Moreno ebbc143152 fix: sql wagonTypeTray
gitea/salix/pipeline/head There was a failure building this commit Details
2024-09-13 08:29:41 +02:00
Jon Elias 99bd20bc05 Merge branch 'dev' into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-13 06:13:26 +00:00
Sergio De la torre 05b6c75a19 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6868_createLogin 2024-09-13 07:02:15 +02:00
Guillermo Bonet 3d598a4ec4 fix: refs #7952 Version
gitea/salix/pipeline/head Build queued... Details
2024-09-12 14:57:19 +02:00
Pako Natek b1027f454b locallyTested
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-12 14:13:17 +02:00
Jorge Penadés 36d8e88ac3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7828-makeCorrectCalls
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-12 13:10:56 +02:00
Ivan Mas 4f9eb865d0 Merge branch 'dev' into 7952-DeprecateCreditInsurance.creditClassification
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-12 10:27:27 +00:00
Jorge Penadés 74fafdf330 fix: refs #7828 filter mail access
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-12 10:27:18 +02:00
Guillermo Bonet fcfef2a970 Merge pull request 'refactor: refs #7900 Deleted sectorProdPriority column' (!2941) from 7900-sectorProdPriority into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2941
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-09-12 08:21:32 +00:00
Guillermo Bonet bb97ccb6bb Merge pull request 'feat: refs #7562 Created deleteDeprecatedObjects' (!2627) from 7562-deleteDeprecatedObjects into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2627
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-09-12 08:08:16 +00:00
Jorge Penadés 6f81ca08db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7828-makeCorrectCalls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-12 09:55:03 +02:00
Jorge Penadés f1f10d1367 refactor: refs #7828 wip 2024-09-12 09:15:07 +02:00
Guillermo Bonet 6075ec6518 feat: refs #7562 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-12 09:06:03 +02:00
Jon Elias d36ce6bf99 Merge branch 'dev' into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-12 05:43:17 +00:00
Jon Elias a73bdfe18f Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule 2024-09-12 07:36:55 +02:00
Guillermo Bonet 728c40916c refactor: refs #7895 workerDocument to workerDms
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 14:38:58 +02:00
Ivan Mas d15be5100d refactor: refs #7952 Deprecate creditInsurance.creditClassification
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 13:42:04 +02:00
Guillermo Bonet 479fc02245 Merge pull request 'feat: refs #6727 Added util logClean' (!2602) from 6727-logClean into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2602
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-09-11 10:48:02 +00:00
Guillermo Bonet 2a41fc6fc4 Merge branch 'dev' into 6727-logClean
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 09:25:52 +00:00
Pablo Natek 842c98edfc Merge branch 'dev' into 6156-advanceTicketsNewField
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 08:22:24 +00:00
Pablo Natek 92f305b9fd fix: refs #6156 proc and version 2024-09-11 10:19:55 +02:00
Jorge Penadés 558ab6eba2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight 2024-09-11 09:30:18 +02:00
Sergio De la torre b492a1e6a8 feat: refs #6868 refs# 6868 handleUser
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 08:05:26 +02: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
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
Guillermo Bonet 9d9e0996f6 Merge branch 'dev' into 7882-quadMinds
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-10 08:12:15 +02:00
Jon Elias 125c0c9b3b refactor: refs #6346 requested changes 2024-09-10 07:50:40 +02:00
Javier Segarra 773933ca3c feat(salix): refs #6156 #6156 change config sql 2024-09-09 15:11:55 +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
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
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
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
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
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 18d93d93a6 chore: refs #7323 worker changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 10:40:16 +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
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
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
Robert Ferrús 3e4caa8edf feat: refs #7929 autoincrement 1 2024-09-05 14:38:55 +02:00
Robert Ferrús 684658bb96 feat: refs #7929 quitar codigo 2024-09-05 14:25:50 +02: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
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
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
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
Pako Natek e574f0060a hotfix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-04 13:37:13 +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
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
Jon Elias 29b0851741 refactor: refs #6346 hook added in wagon-type-tray model
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-03 14:35:05 +02:00
Ivan Mas 690898630c Merge branch 'dev' into 7819-Delete_obsolete_objects
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-03 10:35:47 +00:00
Ivan Mas d330529bf2 feat: refs #7819 Delete obsolete objects
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-03 12:33:26 +02:00
Guillermo Bonet 6b53c24f20 feat: refs #6650 Added saleGroupLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-03 08:17:27 +02:00
Guillermo Bonet 5468049b26 Merge branch 'dev' into 6650-shelvingLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-03 07:59:22 +02:00
Pablo Natek e20ef7c699 Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-03 07:50:41 +02:00
Jorge Penadés b83e548feb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-02 17:02:00 +02:00
Guillermo Bonet 7ab1eea7e9 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-02 14:30:32 +02:00
Guillermo Bonet 89f8e987dc feat: refs #7562 Requested changes
gitea/salix/pipeline/head This commit looks good Details
2024-09-02 14:27:04 +02:00
Carlos Satorres 28a34fa5af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7407-workerMedical
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-02 14:07:01 +02:00
Guillermo Bonet b40ecf9e19 feat: refs #7882 Improved sendOrders and added more config params
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-02 11:48:32 +02:00
Javier Segarra 48c7d1d783 Merge branch 'dev' into 7277-RefundInvoices 2024-09-02 09:35:08 +02:00
Guillermo Bonet f15fd66e48 Merge branch 'dev' into 7562-deleteDeprecatedObjects
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-02 07:57:10 +02:00
Guillermo Bonet 8fee3dd706 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-02 07:06:13 +02:00
Javier Segarra 8aa4427693 Merge branch 'dev' into 7905-getBuysCsv
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-30 21:38:53 +00:00
Guillermo Bonet d46a93a96f Merge branch 'dev' into 7564-ticketVolume
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-30 11:55:03 +00:00
Javi Gallego 51535bfa6b feat: refs #7277 refundInvoices 2024-08-30 13:50:51 +02:00
Guillermo Bonet 7b1a34e249 feat: refs #7860 Update new packagings
gitea/salix/pipeline/pr-test This commit looks good Details
2024-08-30 12:47:05 +02:00
Guillermo Bonet e50c67c305 feat: refs #7905 Added new method getBuysCsv
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-29 12:22:29 +02:00
Guillermo Bonet 72b4607d54 feat: refs #7905 Added new method getBuysCsv
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-29 12:19:06 +02:00
Jorge Penadés 80844acc61 Merge branch 'test' into 7524-warmfix-modifyColumn
gitea/salix/pipeline/pr-test This commit looks good Details
2024-08-28 06:50:28 +00:00
Guillermo Bonet f9c59a9e4c Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-08-28 08:40:24 +02:00
Guillermo Bonet 3dda49b3c5 fix: refs #pako Deleted duplicated version
gitea/salix/pipeline/head This commit looks good Details
2024-08-28 08:40:03 +02:00
Jorge Penadés b833fd5081 chore: refs #7524 modify ormConfig table col
gitea/salix/pipeline/pr-test This commit looks good Details
2024-08-27 14:45:11 +02:00
Pako Natek a4cc36eed1 version
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-27 11:41:34 +02:00
Pako Natek ce2058ec8b version
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-27 08:36:14 +02:00
Jorge Penadés 4a3faebe7d Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-26 16:59:40 +02:00
Guillermo Bonet aaf95e3cff fix: refs #7756 id 0
gitea/salix/pipeline/head This commit looks good Details
2024-08-26 14:39:30 +02:00
Guillermo Bonet 1e91d689c5 Merge branch 'dev' into 7564-ticketVolume
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-26 12:18:20 +00:00
Guillermo Bonet 5a22f009f2 refactor: refs #7817 itemShelving_addList change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-26 14:06:10 +02:00
Javi Gallego 638a43d3e6 Merge pull request '#7710 - clone with ticket packaging' (!2878) from 7710-cloneWithTicketPackaging into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2878
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-08-23 13:41:39 +00:00
Javi Gallego 32d36cda21 feat: refs #7710 pr revision
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-23 14:28:25 +02:00
Ivan Mas c5210157b1 feat: refs #7758 accountDetailType fix deploy error
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-23 13:55:51 +02:00
Guillermo Bonet c9a9a6e074 Merge branch 'dev' into 7882-quadMinds
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-23 11:26:29 +00:00
Guillermo Bonet 0610cbc32e feat: refs #7882 Added model and method
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-23 13:12:11 +02:00
Ivan Mas 754792e3b5 Merge branch 'dev' into 7758-Add_code_mandateType_accountDetailType
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-23 09:36:06 +00:00
Ivan Mas 94461cff58 feat: refs #7758 Modify code lowerCamelCase and UNIQUE
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-23 11:34:26 +02:00
Guillermo Bonet 3974728658 Merge branch 'dev' into 7567-movingCleanFix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-23 07:09:31 +00:00
Ivan Mas 9806265030 Merge branch 'dev' into 7758-Add_code_mandateType_accountDetailType
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-23 06:25:06 +00:00
Ivan Mas 7c545a379f feat: refs #7862 roadmap new fields
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-22 17:02:59 +02:00
Javi Gallego 24468ad338 Merge pull request 'feat: refs #7346' (!2864) from 7346 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2864
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-08-22 09:30:27 +00:00
Ivan Mas 150c60c894 Merge branch 'dev' into 7758-Add_code_mandateType_accountDetailType
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-21 14:49:05 +00:00
Ivan Mas d9d2ae2f7b feat: refs #7758 Add code mandateType and accountDetailType
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-21 16:45:46 +02:00
Guillermo Bonet c2cc7207c3 Merge branch 'dev' into 7567-movingCleanFix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-21 12:42:29 +00:00
Guillermo Bonet 9c4f4ad5a9 Merge branch 'dev' into 7514-srtLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-21 11:21:21 +00:00
Guillermo Bonet d63a1c5497 feat: refs #7882 Added quadMindsConfig table
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-21 12:28:14 +02:00
Guillermo Bonet c641b47a9b feat: refs #7882 Added quadMindsConfig table
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-21 12:26:34 +02:00
Guillermo Bonet 29b779d6ab feat: refs #7882 Added quadMindsConfig table
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-21 12:03:49 +02:00
Guillermo Bonet 0bd64a790e Merge branch 'dev' into 7567-movingCleanFix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-21 07:34:05 +00:00
Guillermo Bonet d2709a871c feat: refs #7514 Changes to put srt log
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-21 08:29:32 +02:00
Guillermo Bonet 92f01f79d3 feat: refs #7800 Added company Fk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-20 13:11:04 +02:00
Guillermo Bonet c991f32f5a feat: refs #7564 Fix version
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-20 12:01:28 +02:00
Guillermo Bonet 9154507b72 Merge branch '7564-ticketVolume' of https://gitea.verdnatura.es/verdnatura/salix into 7564-ticketVolume
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-20 11:45:52 +02:00
Guillermo Bonet 2b12e046e4 feat: refs #7564 Fix version 2024-08-20 11:45:50 +02:00
Guillermo Bonet 289dc58be4 Merge branch 'dev' into 7564-ticketVolume
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-20 09:45:01 +00:00
Guillermo Bonet 8a03650eca feat: refs #7564 Requested changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-20 11:44:38 +02:00
Guillermo Bonet 7fc47f0506 feat: refs #7564 Requested changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-20 11:43:08 +02:00
Guillermo Bonet 45fa615daf Merge branch 'dev' into 7712-sizeLimit
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-20 08:28:19 +00:00
Guillermo Bonet 3087a14248 Merge branch 'dev' into 7759-newDefiner
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-20 10:07:33 +02:00
Guillermo Bonet 8e63d85964 feat: refs #7759 Changed name
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-20 10:06:10 +02:00
Guillermo Bonet 1f5145ba9e feat: refs #7712 Unify
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-20 09:34:02 +02:00
Guillermo Bonet 0fcff01433 refactor: refs #7756 Fix tests
gitea/salix/pipeline/head This commit looks good Details
2024-08-20 09:11:30 +02:00
Guillermo Bonet fc1767cab4 refactor: refs #7756 Fix tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-20 08:45:04 +02:00
Guillermo Bonet b1ef037272 Merge branch 'dev' into 7756-fixRefFk
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-20 08:05:51 +02:00
Javi Gallego ccfb53891f Merge branch 'dev' into 7346
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-19 09:10:06 +02:00
Javi Gallego 575577d29b feat: refs #7346 add multiple feature
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-16 10:08:58 +02:00
Jorge Penadés 2aaad4316b Merge branch 'dev' into 7524-limitSelect
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-16 06:54:35 +00:00
Jorge Penadés 57a1de7f13 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-14 16:29:12 +02:00
Javi Gallego f21c292e20 Merge branch 'dev' into 7346 2024-08-14 12:19:40 +02:00
Javi Gallego 7f543e8d3a Merge branch 'dev' into 7346 2024-08-14 10:32:32 +02:00
Guillermo Bonet 68ee5e3549 fix: refs #7800 tpvMerchantEnable PRIMARY KEY
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-13 12:52:39 +02:00
Guillermo Bonet dd5845abae fix: refs #7800 tpvMerchantEnable PRIMARY KEY
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-13 12:49:56 +02:00
Guillermo Bonet 360e20545a feat: refs #7799 Added Fk in vn.item.itemPackingTypeFk
gitea/salix/pipeline/head This commit looks good Details
2024-08-13 12:26:01 +02:00
Guillermo Bonet 38cf5af23e feat: refs #7842 Added editorFk in vn.host
gitea/salix/pipeline/head This commit looks good Details
2024-08-13 12:21:03 +02:00
Jorge Penadés 85f064c869 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-13 11:41:52 +02:00
Guillermo Bonet 61d6efaea7 refactor: refs #7798 Drop bi.Greuges_comercial_detail
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-13 09:53:05 +02:00
Jorge Penadés c742f6f79d 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-08-12 16:59:28 +02:00
Jorge Penadés 3adb73cddf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7524-limitSelect
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-12 15:38:40 +02:00
Guillermo Bonet 8655ca0a21 Merge branch 'dev' into 7646-deleteColumnsProductionConfig
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-12 06:04:06 +00:00
Guillermo Bonet 00845c0534 refactor: refs #7646 #7646 Deleted scannable* variables productionConfig
gitea/salix/pipeline/pr-dev Build queued... Details
2024-08-12 08:03:49 +02:00
Guillermo Bonet 4fc43df11b feat: refs #6650 new itemShelvingLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-09 11:28:30 +02:00
Guillermo Bonet d60f8a5319 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-09 08:26:22 +02:00
Guillermo Bonet cf13aa917e feat: refs #7126 saleQuantity to saleWasteQuantity
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-08-09 08:18:30 +02:00
Pablo Natek eaf7730394 Merge branch 'master' into 6403-from-packingSite-to-productionConfig
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-06 14:58:54 +00:00
Jorge Penadés c31e33535d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7524-limitSelect
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-06 15:23:59 +02:00
Pako Natek fc7c7beef7 Merge branch 'dev' into 7836-futureEntries
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-06 11:23:56 +00:00
Guillermo Bonet 58677dca56 Merge pull request 'refactor: refs #7820 Deprecated silexACL' (!2833) from 7820-silexAcl into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2833
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-08-06 07:15:20 +00:00
Guillermo Bonet 1e41f5d533 Merge pull request 'feat: refs #7713 Created ACLLog' (!2783) from 7713-AclLog into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2783
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-08-06 05:05:19 +00:00
Pablo Natek f148635c68 Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed 2024-08-05 15:41:41 +02:00
Pablo Natek 961fafb33e feat: refs #7404 stockBought add and calculate 2024-08-05 15:32:36 +02:00
Pako Natek be5859b8cf prototipo
gitea/salix/pipeline/pr-dev Build queued... Details
2024-08-05 14:28:29 +02:00
Guillermo Bonet fa3a7aa931 refactor: refs #7820 Deprecated silexACL
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-05 12:49:04 +02:00
Jorge Penadés 57f6c6d9a1 chore: refs #7663 WIP setWeight
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-31 10:43:55 +02:00
Robert Ferrús 1d22dc46f0 Merge branch 'dev' into 7646-deleteColumnsProductionConfig
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-31 06:20:10 +00:00
Carlos Andrés a61f68cbc9 Merge pull request 'master' (!2811) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2811
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
2024-07-30 14:49:38 +00:00
Sergio De la torre 2015256f5d hotFix reallocate resfs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-30 12:38:13 +02:00
Jorge Penadés 766da06c2f feat: refs #7524 add mock limit on find query
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-30 09:40:34 +02:00
Guillermo Bonet a01ae9b7b8 fix: refs #7756 Foreign keys invoiceOut
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-29 14:09:55 +02:00
Guillermo Bonet baa1498923 feat: refs #7712 sizeLimit
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-29 13:29:26 +02:00
Guillermo Bonet 6de9ea4b16 Merge branch 'dev' into 7759-newDefiner
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-29 07:18:23 +02:00
Pablo Natek 000a967a03 feat: refs #6403 packingSite to productionConfig
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-26 07:12:51 +02:00
Guillermo Bonet 95b61ae86a Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-25 13:29:42 +02:00
Robert Ferrús 6661cb4c2a fix: refs #7654 itemShelving
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-25 12:30:18 +02:00
Guillermo Bonet ff8f340978 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-25 09:40:45 +02:00
Guillermo Bonet af62c2e807 fix: refs #7664 No insert editorFk 2024-07-25 08:57:18 +02:00
Jon Elias 9e844c15b7 Merge branch 'dev' into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-25 05:07:32 +00:00
Guillermo Bonet 3d1d5841fd Merge branch 'dev' into 7728-Vctos-DUA
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-24 08:25:33 +00:00
Guillermo Bonet cf3ee07dd2 feat: refs #7713 Created ACLLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-24 10:03:51 +02:00
Robert Ferrús 5a9ab84356 feat: refs #7646 delete scannableCodeType 2024-07-24 09:14:28 +02:00
Jon Elias 03523afff1 Merge branch 'dev' into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-23 11:26:59 +00:00
Jon Elias 2568ac4e92 feat: refs #6346 new wagon type section
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-23 13:24:43 +02:00
Alex Moreno 1c45aef883 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 11:46:19 +02:00
Alex Moreno e35ded5e35 hotFix: add summaryId to productionConfigLog & agencyLog
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 11:01:57 +02:00
Sergio De la torre c777b8dbf1 Merge pull request 'feat checkExpeditionPrintOut refs #7751' (!2762) from 7751_boxPicking_check into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2762
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-22 20:33:47 +00:00
Guillermo Bonet 169534568e Merge branch 'test' into dev 2024-07-22 12:36:27 +02:00
Guillermo Bonet b58cdcc590 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-22 12:24:39 +02:00
Guillermo Bonet 219740f669 feat: refs #7759 Changed definer root to vn-admin
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-22 11:52:42 +02:00
Carlos Andrés 5567359d73 feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 15:34:32 +02:00
Guillermo Bonet fe363fd4db fix: refs #7126 Primary key no unique data
gitea/salix/pipeline/head This commit looks good Details
2024-07-19 15:00:13 +02:00
Guillermo Bonet 05598b3371 fix: refs #7126 Slow update
gitea/salix/pipeline/head This commit looks good Details
2024-07-19 14:29:20 +02:00
Guillermo Bonet ca48c64163 Merge branch 'dev' into 7126-improvedWaste
gitea/salix/pipeline/head This commit looks good Details
2024-07-19 13:19:02 +02:00
Javier Segarra 287f9edc83 fix(salix): refs #7648 #7648 improve update ACL
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-19 11:54:21 +02:00
Javier Segarra 376ddebdcd Merge branch 'master' into 7648_myEntries 2024-07-19 11:42:53 +02:00
Guillermo Bonet 9466c7e529 Merge branch 'dev' into 6727-logClean
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 07:30:07 +00:00
Alex Moreno b8244b48e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7547-accessToken-security
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 09:08:47 +02:00
Guillermo Bonet 3cf5555612 feat: refs #6727 Fixes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 08:58:51 +02:00
Guillermo Bonet 930e2951b7 feat: refs #6727 Added started and finished
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 08:27:39 +02:00
Sergio De la torre f19f107971 feat checkExpeditionPrintOut refs #7751
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 08:27:22 +02:00
Guillermo Bonet 3525c878b6 Merge pull request 'feat: refs #7511 Rename to multiConfig tables' (!2711) from 7511-multiConfig into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2711
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-19 05:46:42 +00:00
Guillermo Bonet 3449aeb673 refactor: refs #7511 Minor change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 07:45:17 +02:00
Sergio De la torre dbf91293f8 Merge pull request 'master' (!2761) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2761
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-19 04:31:34 +00:00
Sergio De la torre 2d2eafd4ed Merge branch 'master' into 6861_hotFix_resevas
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-18 15:17:26 +00:00
Guillermo Bonet f18b165e4a Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-18 13:45:23 +02:00
Guillermo Bonet ba5c44994d feat: refs #7686 Added cascade on update vn.state.alertLevel
gitea/salix/pipeline/head This commit looks good Details
2024-07-18 13:45:06 +02:00
Sergio De la torre bd10741311 hotFix reservas refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-18 12:42:00 +02:00
Sergio De la torre 0181764744 Merge pull request 'master' (!2750) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2750
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-17 15:09:35 +00:00
Sergio De la torre a35ec4a42c hotFix reservas refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-17 16:48:52 +02:00
Sergio De la torre 8ff3e8acb0 hotFix reservas refs #6861 2024-07-17 16:21:37 +02:00
Sergio De la torre 3aea6fdd46 hotFix reservas refs #6861 2024-07-17 16:13:31 +02:00
Pablo Natek 075f2b7ba4 Merge pull request 'feat: refs #7297 add new columns' (!2740) from 7297-itemAddTags10-13 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2740
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-17 12:58:40 +00:00
Alex Moreno e5bfb4af23 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-17 12:20:22 +02:00
Javier Segarra 5293becb6d Merge branch 'master' into 7648_myEntries
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-16 11:52:54 +00:00
Sergio De la torre 3f297acbd3 hotFix itemShelvingSale refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-16 13:06:04 +02:00
Javier Segarra 6856ab0501 feat(salix): refs #7648 #7648 myEntries 2024-07-16 12:45:14 +02:00
Sergio De la torre c086de2644 hotFix itemShelvingSale refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-16 11:38:44 +02:00
Pablo Natek 99bbb55c37 feat: refs #7297 add new columns
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-16 10:02:57 +02:00
Javi Gallego 63763f2b22 Merge branch 'dev' into 7346 2024-07-16 09:32:16 +02:00
Carlos Andrés 8d61cb762b feat: tabla config dias margen vctos. refs #7728
gitea/salix/pipeline/pr-dev Build queued... Details
2024-07-15 17:53:23 +02:00
Sergio De la torre 87b0d3e8d1 refs newStatePartial refs #7642
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-15 16:18:30 +02:00
Robert Ferrús 200a6714bb fix: refs #7722 delete sms
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-15 12:02:00 +02:00
Alex Moreno eca89c1c4e Merge branch 'dev' into 7348-client-hasDailyInvoice
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-15 08:19:26 +00:00
Guillermo Bonet 1e264c2102 fix: refs #7704 Warehouse priority 2024-07-12 14:04:49 +02:00
Guillermo Bonet f8f6950de1 Merge pull request 'feat: refs #6769 itemDiary' (!2683) from 6769-itemDiary into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2683
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-12 08:13:27 +00:00
Guillermo Bonet 9b8e2e1279 Merge pull request 'feat: refs #7704 Major changes' (!2717) from 7704-itemMinimalQuantity into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2717
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-12 07:43:44 +00:00
Guillermo Bonet bb787b1581 refactor: refs #7704 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 09:03:37 +02:00
Guillermo Bonet 5c80a99543 feat: refs #7704 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 07:58:59 +02:00
Guillermo Bonet 0fd0302545 Merge pull request 'feat: refs #7378 Added productionConfigLog' (!2671) from 7378-productionLogConfig into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2671
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-11 12:36:05 +00:00
Guillermo Bonet 443a752cfe feat: refs #7704 Added check
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 13:45:24 +02:00
Guillermo Bonet 0d30331c9a feat: refs #7704 Fixtures hedera
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 13:25:26 +02:00
Guillermo Bonet 0416ebedb5 feat: refs #7704 Added grant
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 09:54:49 +02:00
Guillermo Bonet 02bcfd9be3 feat: refs #7704 Major changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 08:57:45 +02:00
Javi Gallego c45c920dbb Merge branch '7348-client-hasDailyInvoice' of https://gitea.verdnatura.es/verdnatura/salix into 7348-client-hasDailyInvoice
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 08:52:15 +02:00
Javi Gallego 5304929f57 feat: #refs 7348 schema 2024-07-11 08:52:07 +02:00
Javi Gallego 618baaf604 usa campo factura multipe 2024-07-11 08:37:08 +02:00
Guillermo Bonet a82f7bc025 Merge branch 'dev' into 6769-itemDiary
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-10 10:04:27 +00:00
Guillermo Bonet 27f9001e34 refactor: refs #7378 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-10 11:35:05 +02:00
Alex Moreno c7d9fae17b Merge branch 'dev' into 7348-client-hasDailyInvoice
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-10 08:39:35 +00:00
Guillermo Bonet a003cd24f6 Merge pull request 'refactor: refs #7684 vehicle warehouseFk fix' (!2697) from 7684-vehicleFixFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2697
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-10 08:22:45 +00:00
Guillermo Bonet 46e8f5b811 feat: refs #7511 Rename to multiConfig tables
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-10 07:46:18 +02:00
Robert Ferrús 5bfabee6e3 Merge branch 'dev' into 7116-agencyIncoming
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-10 05:19:02 +00:00
Robert Ferrús 004dcb67ff feat: refs #7116 insert into agencyIncoming
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-10 07:13:57 +02:00
Guillermo Bonet 0b61a175ef Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-07-09 14:49:51 +02:00
Guillermo Bonet b28ef09f3d Merge branch 'dev' into 7126-improvedWaste
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 12:04:02 +02:00
Guillermo Bonet 1f2c0190d0 Merge branch 'dev' into 7126-improvedWaste
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 12:02:15 +02:00
Robert Ferrús 8f86ffbc38 fix: refs #6738
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-09 11:47:02 +02:00
Robert Ferrús d8f3a04553 fix: refs #6738 restore column grupotarifa
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-09 11:45:58 +02:00
Guillermo Bonet 5b9e6f0e59 Merge pull request 'feat: refs #7622 Added type column addressWaste' (!2688) from 7622-addressWaste into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2688
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-09 09:33:53 +00:00
Javier Segarra 725cbb5aa4 Merge pull request '#7380 - Substitution field' (!2677) from 7380_substitutionCondition into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2677
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-09 07:46:50 +00:00
Javier Segarra 4d52e32718 Merge branch 'dev' into 7380_substitutionCondition
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 06:24:27 +00:00
Robert Ferrús 9892b37ed0 Merge branch 'dev' into 7116-agencyIncoming
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 06:24:05 +00:00
Alex Moreno 1866c16727 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-08 14:33:12 +02:00
Alex Moreno 30d118f9df Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-08 14:32:43 +02:00
Javier Segarra f009e8f8ad Merge branch 'dev' into 7380_substitutionCondition
gitea/salix/pipeline/pr-dev Build queued... Details
2024-07-08 12:11:53 +00:00
Javi Gallego 938037d67a Merge branch 'dev' into 7348-client-hasDailyInvoice 2024-07-08 12:40:00 +02:00
Guillermo Bonet 4757ce11a3 refactor: refs #7567 Fix and improvement
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-08 12:35:29 +02:00
Guillermo Bonet f79b2378af Merge branch 'dev' into 7622-addressWaste
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-08 10:05:35 +00:00
Guillermo Bonet eb60a1ed77 Merge branch 'dev' into 7378-productionLogConfig
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 10:00:32 +00:00
Robert Ferrús 0722a97c60 feat: refs #7582
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 11:28:33 +02:00
Robert Ferrús a796787cb5 feat: refs #7582
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 11:04:35 +02:00
Robert Ferrús 3fa0823d93 feat: refs #7582 quitar vn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 11:01:35 +02:00
Guillermo Bonet 4b0a08d965 refactor: refs #7684 vehicle warehouseFk fix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 10:57:46 +02:00
Pablo Natek 62045756e6 fix: refs #6403 extend length to 6 digits for mrw clientType
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-08 10:50:15 +02:00
Javier Segarra 8355d544c3 Merge branch '7380_substitutionCondition' of https://gitea.verdnatura.es/verdnatura/salix into 7380_substitutionCondition
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 09:54:56 +02:00
Javier Segarra 9f4680325b feat(salix): refs #7380 #7380 rename extension file 2024-07-08 09:54:52 +02:00
Robert Ferrús e9d2ff1476 feat: refs #7582 claimDestination addColumn code
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 09:43:59 +02:00
Javier Segarra 570b06bd18 Merge branch 'dev' into 7380_substitutionCondition
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-07 21:27:04 +00:00
Javier Segarra 2f10066290 feat(salix): refs #7380 #7380 remove new field
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-07 23:23:30 +02:00
Ivan Mas f07964be20 Merge pull request 'refs #7561 add fk en userFk' (!2690) from 7561-userFk-expeditionState into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2690
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-07-05 12:11:01 +00:00
Ivan Mas 3508cf3a9e refs #7561 add fk en userFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-05 14:01:09 +02:00
Guillermo Bonet fb07cdccc3 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-05 13:51:09 +02:00
Guillermo Bonet 5712fbd782 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-05 13:50:43 +02:00
Guillermo Bonet b9e986c962 feat: refs #7622 Fix
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-05 12:39:54 +02:00
Guillermo Bonet 1799b52f8b feat: refs #7622 Added type column addressWaste
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-05 12:37:59 +02:00
Guillermo Bonet aa46d7a536 refs #6769 item_getBalance optimization
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-05 09:46:09 +02:00
Robert Ferrús 27a4b747b5 fix: refs #6371 restore table Series 2024-07-05 09:05:39 +02:00
Robert Ferrús 1e109a493d Merge branch 'dev' into 7116-agencyIncoming
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-05 05:40:14 +00:00
Javier Segarra 17e7dc8c7e feat(salix): refs #7380 #7380 new typeObservation
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-03 23:02:47 +02:00
Javier Segarra d59cab13d8 feat(salix): refs #7380 #7380 client.substitutionAllowed new field 2024-07-03 23:02:28 +02:00
Robert Ferrús 4f9552379e feat: refs #7654 entry_splitByShelving
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 13:46:19 +02:00
Guillermo Bonet a0d524b22b Merge pull request 'refactor: refs #7504 Rename id greuge' (!2669) from 7504-greugeId into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2669
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-03 11:17:18 +00:00
Guillermo Bonet 2c39c2a6ba Merge pull request 'feat: refs #7664 Added created in calendar table' (!2668) from 7664-createdCalendar into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2668
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-03 09:50:32 +00:00
Guillermo Bonet cf63d6e71c feat: refs #7378 Added productionConfigLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 11:17:33 +02:00
Jorge Penadés 12f29aa50e Merge pull request '#6449 addColumnLogTables' (!2277) from 6449-addColumnLogTables into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2277
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-07-03 08:51:56 +00:00
Javi Gallego a8d663bee4 feat: refs #7348 hasDailyInvoice field
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 10:49:51 +02:00
Guillermo Bonet aaca2d12c5 refactor: refs #7504 Rename id greuge
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 10:20:20 +02:00
Guillermo Bonet 77d86c9fd9 feat: refs #7664 Added created in calendar table
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 09:55:14 +02:00
Javier Segarra d72a52d6b1 Merge pull request '#7648 - Customer View Entries' (!2659) from 7648_dev_customerEntries into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2659
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-03 07:29:00 +00:00
Sergio De la torre 1561e15d5e feat roadmap refs #7195
gitea/salix/pipeline/pr-test This commit looks good Details
2024-07-03 09:21:58 +02:00
Jorge Penadés 1c6dd17f90 Merge branch 'dev' into 6449-addColumnLogTables
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 07:10:41 +00:00