Commit Graph

2420 Commits

Author SHA1 Message Date
Robert Ferrús a248c9b7f2 Merge branch 'dev' into 7248-tablesObservation
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-06 13:05:58 +00:00
Guillermo Bonet 9f302fac24 Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2025-02-06 13:47:36 +01:00
Guillermo Bonet 92ca3a2582 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2025-02-06 13:47:17 +01:00
Ivan Mas f12a690bef feat: refs #8487 delete appointment from travel view
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-06 13:28:44 +01:00
Carlos Andrés fa5888f931 Merge branch 'master' of https: refs #8535//gitea.verdnatura.es/verdnatura/salix into 8535-log-mandate
gitea/salix/pipeline/pr-master This commit looks good Details
2025-02-06 11:53:57 +01:00
Carlos Andrés 9b2c0f1c48 feat: refs #8535 log table mandate
gitea/salix/pipeline/pr-master This commit looks good Details
2025-02-06 11:46:39 +01:00
Juanjo Breso 8df36f296a feat: refs #269518 isFragile item and itemType
gitea/salix/pipeline/pr-master This commit looks good Details
2025-02-06 09:11:48 +01:00
Carlos Andrés 37b735b988 feat: refs #8535 sistema de warnings
gitea/salix/pipeline/pr-master This commit looks good Details
2025-02-05 17:21:36 +01:00
Robert Ferrús 9a80f50fed Merge branch 'dev' into 7248-tablesObservation
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-05 12:35:05 +00:00
Robert Ferrús eaea108e62 feat: refs #7248 modify column workerFk to userFK
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-05 13:30:40 +01:00
Jon Elias 502b48718c Merge pull request '#7965 - unifyProblems' (!2990) from 7965-unifyProblems into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2990
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-02-05 06:51:54 +00:00
Alex Moreno fe7a1c60cc Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-04 13:03:17 +01:00
Guillermo Bonet eb9d3a7b21 refactor: refs #8227 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-04 08:27:21 +01:00
Guillermo Bonet a408af2467 Merge branch 'dev' into 8227-roadmap 2025-02-03 13:23:18 +01:00
Javi Gallego 55ec4aaba1 Merge pull request 'feat: refs #7686 Added new alertLevel ON_PREVIOUS and changes in vn.state.alertLevel' (!2890) from 7686-onPrevious into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2890
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2025-02-03 08:12:36 +00:00
Javi Gallego adba4765ed refactor: refs #7686 update alert level conditions to only check for 'FREE'
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-03 09:07:08 +01:00
Guillermo Bonet 12604d0f67 Merge branch 'dev' into 8227-roadmap
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-31 14:27:18 +01:00
Guillermo Bonet 8dc803b5df feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-31 14:25:23 +01:00
Ivan Mas 2e4c5fe401 feat: refs #8477 add costPerKg to awb view
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-31 12:10:19 +01:00
Guillermo Bonet b40f145613 feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-31 10:57:44 +01:00
Ivan Mas da5e395450 feat: refs #8312 add flippingCost column to Cubos view
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-31 10:17:01 +01:00
Carlos Andrés 672ef36501 fix: refs #8511 ref #8511 ensure entry is editable for new entryFk in buy_beforeUpdate trigger
gitea/salix/pipeline/pr-master This commit looks good Details
2025-01-30 18:11:30 +01:00
Javi Gallego 3965441f7f Merge branch 'dev' into 7686-onPrevious
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-30 15:29:45 +01:00
Guillermo Bonet 855600811e feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-30 15:00:19 +01:00
Guillermo Bonet 123f28055e feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-30 09:28:44 +01:00
Sergio De la torre c96d083467 fix: refs #7920 shelvingFkByCode
gitea/salix/pipeline/pr-master This commit looks good Details
2025-01-30 09:16:54 +01:00
Robert Ferrús 4bd92f2cb2 Merge branch '7248-tablesObservation' of https://gitea.verdnatura.es/verdnatura/salix into 7248-tablesObservation
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-30 09:16:10 +01:00
Robert Ferrús bc00c28abc feat: refs #7248 create trigger 2025-01-30 09:16:06 +01:00
Robert Ferrús 9c467e67e0 Merge branch 'dev' into 6822-entryTransferFix
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-30 06:07:59 +00:00
Javier Segarra efe0aa708f Merge branch 'dev' into 7134-supplierBalance
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-29 15:13:49 +00:00
Guillermo Bonet a14d6227a1 feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-29 14:15:22 +01:00
Robert Ferrús 35e72c90d3 Merge branch 'dev' into 6822-entryTransferFix
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-29 11:46:23 +00:00
Pako Natek af5b4981df Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-29 11:16:41 +00:00
Pako Natek 4e2a6d275a fix(travel): refs #8408 trigger restriction for wrong availabled value
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
Refs: #8408
2025-01-29 12:12:23 +01:00
Pako Natek 0de9c3c172 feat(available): refs #8408 available refreshing now includes time
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
Refs: #8408
2025-01-29 12:03:55 +01:00
Juan Ferrer 9a6b89793c fix: refs #8494 Fix ZoneIncluded logs
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test There was a failure building this commit Details
gitea/salix/pipeline/pr-master Build started... Details
2025-01-29 10:35:06 +01:00
Javier Segarra a63ca1b3c5 Merge branch 'dev' into 7134-supplierBalance 2025-01-28 23:39:03 +01:00
Carlos Andrés 801629c8db fix: refs #8492 Sage invoiceInTax Check VAT
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-28 18:04:02 +01:00
Robert Ferrús 8482743baf feat: refs #6822 ACL
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-28 11:26:48 +01:00
Javier Segarra 9419eada64 Merge branch 'dev' into 7134-supplierBalance
gitea/salix/pipeline/pr-dev Build queued... Details
2025-01-28 08:46:17 +01:00
Javi Gallego 0def25ad15 Merge branch 'dev' into 7686-onPrevious 2025-01-28 08:28:16 +01:00
Javi Gallego 1261722943 Merge pull request 'feat: refs #8381 add agencyModeFk to travel thermograph and create AgencyModeIncoming model' (!3369) from 8381-thermographTravel into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3369
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-27 15:12:51 +00:00
Javi Gallego ba2333f180 refactor: refs #7686 remove unused stored procedures for item shelving and ticket delay
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-27 15:05:27 +01:00
Guillermo Bonet a948442e13 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2025-01-27 11:24:05 +01:00
Guillermo Bonet aecf529976 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2025-01-27 11:23:55 +01:00
Guillermo Bonet cd8e04d648 refactor: refs #7568 ticket_doCmr ignore alertLevel
gitea/salix/pipeline/head This commit looks good Details
2025-01-27 11:22:21 +01:00
Guillermo Bonet 75168eef91 feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-27 11:04:34 +01:00
Guillermo Bonet 75b0589561 feat: refs #8227 Undo vehicle_checkNumberPlate change and triggers checks
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-24 12:34:08 +01:00
Guillermo Bonet e9f1e28ac0 feat: refs #8227 Added roadmap_cloneDay
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-24 11:20:16 +01:00
Guillermo Bonet a6908aa8c0 Merge branch 'dev' into 8227-roadmap
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-24 06:00:37 +00:00