Commit Graph

26974 Commits

Author SHA1 Message Date
Juan Ferrer 64b8265675 fix: refs #4409 tLotStatus alias fix
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-26 09:36:43 +01:00
Juan Ferrer a310b3e642 Merge branch 'dev' into 4409-binlog
gitea/salix/pipeline/pr-dev Build queued... Details
2025-02-26 09:32:16 +01:00
Juan Ferrer 556a58fb11 fix: refs #4409 Requested changes from PR 3440
gitea/salix/pipeline/pr-dev Build started... Details
2025-02-26 09:31:36 +01:00
Pako Natek 903eb0bc58 Merge pull request 'feat(catalog_calculate): priceDelta.isHidden restriction' (!3497) from 8674-restringir-acceso-a-familias-segun-priceDelta into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3497
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-02-26 07:43:34 +00:00
Pako Natek aa597870a4 feat(catalog_calculate): priceDelta.isHidden restriction
gitea/salix/pipeline/pr-dev This commit looks good Details
refs#8674
2025-02-26 08:33:39 +01:00
Alex Moreno a9ae260409 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2025-02-26 07:31:33 +01:00
Alex Moreno e4a9ada838 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit Details
2025-02-26 07:31:18 +01:00
Juan Ferrer 9dca258a72 fix: refs #4409 stock_refreshAll comments merged
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-25 18:25:58 +01:00
Juan Ferrer 7ad97a49cb fix: refs #4409 Added ticket.isAlive, orderRow.isReserved
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-25 18:23:41 +01:00
Alex Moreno 73d92db112 Merge pull request 'hotFix_closeAll_emailDeliveryNote' (!3496) from hotFix_closeAll_emailDeliveryNote into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3496
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-02-25 14:07:17 +00:00
Alex Moreno 2914dfff2e feat: add Catalan localization for email templates and footer
gitea/salix/pipeline/pr-master This commit looks good Details
2025-02-25 14:59:54 +01:00
Alex Moreno fbdc715fa5 feat: enhance ticket closing process with email notifications and error handling 2025-02-25 14:59:49 +01:00
Juan Ferrer 842e837ab6 fix: refs #4409 include/exclude logic clarified
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-25 14:04:46 +01:00
Juan Ferrer a4a2a3958d fix: refs #4409 stock_refreshAll added
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-25 12:46:21 +01:00
Juan Ferrer b85db29828 Merge branch 'dev' into 4409-binlog
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-25 11:24:57 +01:00
Juan Ferrer a88f41dd4b Merge branch 'dev' into 4409-binlog
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-25 11:18:19 +01:00
Juan Ferrer dc8cc6b49b fix: refs #4409 buyOut version source index fix
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-25 10:52:23 +01:00
Juan Ferrer 38b1e9e493 fix: refs #4409 SQL convenion fixes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-25 10:49:58 +01:00
Sergio De la torre 65c3f158f7 Merge pull request 'feat: refs#8624 addWorkerActions' (!3489) from 8624-addActionCleanShelving into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #3489
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-02-25 08:22:30 +00:00
Carlos Satorres 380d1f69e5 Merge pull request 'fix: refs #6553 workerBusiness, workerDescriptor' (!3484) from 6553-workerBusinessV2 into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3484
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-02-25 08:14:13 +00:00
Carlos Satorres d6a520d81a Merge branch 'test' into 6553-workerBusinessV2
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-25 08:10:54 +00:00
Sergio De la torre 5093393f3b Merge branch 'dev' into 8624-addActionCleanShelving
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-25 06:19:12 +00:00
Jose Antonio Tubau 08cd31181b Merge pull request 'fix: update foreign key model reference in agency-workCenter.json' (!3491) from agencyWorkCenterModelFix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3491
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-02-25 06:04:52 +00:00
Jose Antonio Tubau 22a592d05f Merge branch 'dev' into agencyWorkCenterModelFix
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-25 06:02:55 +00:00
Juan Ferrer 7049933c6e fix: refs #4409 clean frozen sales and lost reserves
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-24 18:50:25 +01:00
Ivan Mas 3cd76c03ef Merge pull request 'fix: refs #8613 fk claimEnd' (!3492) from 8613-claimEnd-FK into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3492
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2025-02-24 17:17:52 +00:00
Ivan Mas 04b6be23a1 fix: refs #8613 fk claimEnd
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-24 18:13:56 +01:00
Juan Ferrer 5e630562ce fix: refs #4409 don't cache parent ids
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-24 18:05:21 +01:00
Sergio De la torre 08cd2d2221 feat: refs #8624 refs#8624 addWorkerActions
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-24 16:50:35 +01:00
Sergio De la torre 2941e5f80a feat: refs #8624 refs#8624 addWorkerActions
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-24 16:48:41 +01:00
Ivan Mas 3330db84fa Merge pull request 'refactor: refs #8613 add fk to claimEnd.claimDestinationFk' (!3479) from 8613-addFkClaimDestinationFk into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #3479
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-02-24 15:09:25 +00:00
Ivan Mas 85fb754bc9 Merge branch 'dev' into 8613-addFkClaimDestinationFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-24 15:05:36 +00:00
Jose Antonio Tubau b215938327 fix: update foreign key model reference in agency-workCenter.json
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-24 14:38:52 +01:00
Juan Ferrer 1c77e69ae4 fix: refs #4409 lotFk used for row identification
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-24 13:24:41 +01:00
Javi Gallego dbe58c6630 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2025-02-24 13:09:57 +01:00
Javi Gallego a021383df0 fix: update shipped property assignment in refund ticket creation 2025-02-24 13:09:53 +01:00
Ivan Mas 218bb4db6f Merge branch 'dev' into 8613-addFkClaimDestinationFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-24 11:38:06 +00:00
Alex Moreno ffbc368dc7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2025-02-24 12:35:55 +01:00
Alex Moreno d12553bbd4 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2025-02-24 12:35:46 +01:00
Ivan Mas 8e6eeca5e8 refactor: refs #8613 change on delete to restrict
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-24 12:17:59 +01:00
Sergio De la torre 119ae0819b feat: refs#8624 addWorkerActions
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-24 11:07:31 +01:00
Carlos Satorres aace7fc8ad Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusinessV2
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-21 15:19:02 +01:00
Carlos Satorres 35cfce552b fix: refs #6553 getWorkerBusiness
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-21 15:14:46 +01:00
Carlos Satorres ebfba823b0 fix: refs #6553 workerBusiness, workerDescriptor
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-21 14:59:02 +01:00
Javi Gallego 532b430d2b Merge pull request '7937-claimAgile' (!3429) from 7937-claimAgile into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3429
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-02-21 13:58:36 +00:00
Alex Moreno d1053642e9 Merge branch 'dev' into 7937-claimAgile
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-21 13:16:49 +00:00
Javi Gallego 4dcd3f0d76 Merge pull request 'refactor: refs #7764 add role assignment for supplier during user creation' (!3481) from 7764-createClienteAsSupplier into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3481
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-02-21 13:00:59 +00:00
Javier Segarra a410432365 Merge branch 'dev' into 7764-createClienteAsSupplier
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-21 12:17:20 +00:00
PAU ROVIRA ROSALENY 63568696e2 Merge pull request 'fix: #8612 handled duplicate code error in shelving & parking' (!3476) from 8612-shelvinge2e into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3476
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-02-21 11:59:53 +00:00
Javi Gallego a15cf04a4c refactor: refs #7764 include options parameter in role retrieval for user creation tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-21 12:53:08 +01:00