Commit Graph

2495 Commits

Author SHA1 Message Date
Pako Natek 86091571cd Merge pull request 'fix(item_getBalance): refs #8408 availabled field prevails over landed' (!3449) from 8408-Disponible-por-zonas-y-horas into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3449
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-02-13 12:39:29 +00:00
Pako Natek 3a1849326b fix(item_getBalance): refs #8408 availabled field prevails over landed
gitea/salix/pipeline/pr-dev This commit looks good Details
Refs: #8408
2025-02-13 08:41:13 +01:00
Pako Natek 317c152c66 Merge branch 'dev' into 8575-itemPackingType-Altillo
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-13 06:41:43 +00:00
Guillermo Bonet 8959eb21f6 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2025-02-12 14:37:34 +01:00
Guillermo Bonet 5543da2c80 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2025-02-12 14:37:10 +01:00
Guillermo Bonet ba3909a984 refactor: refs #6944 Requested changes
gitea/salix/pipeline/pr-master This commit looks good Details
2025-02-12 14:13:39 +01:00
Pako Natek b95db2eff1 feat(productionControl and collection_new): refs #8575 new itempackingtype a
gitea/salix/pipeline/pr-dev This commit looks good Details
Refs: #8575
2025-02-12 13:45:07 +01:00
Alex Moreno 5d155ef6bd Merge branch 'test' into hotFix_daily_addressInvoice_2
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-12 11:17:27 +00:00
Guillermo Bonet e7c027a8b1 refactor: refs #6944 Update ticket_setState to improve state change logic and user tracking
gitea/salix/pipeline/pr-master This commit looks good Details
2025-02-12 10:06:48 +01:00
Alex Moreno 3fbd740a2b fix: address invoice daily
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2025-02-11 14:31:26 +01:00
Guillermo Bonet f682e3cfe6 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2025-02-11 13:26:18 +01:00
Guillermo Bonet 0a33e05bff Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2025-02-11 13:26:02 +01:00
Guillermo Bonet a387e3ae92 feat: refs #7162 Add packages and packagesList to ticket_doCmr procedure
gitea/salix/pipeline/head This commit looks good Details
2025-02-11 13:25:30 +01:00
Javier Segarra 095e561c82 Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-11 08:43:21 +00:00
Pako Natek fbf56ff0cf fix(available_refresh): refs #8408 more availabled cases
refs#8408
2025-02-11 08:46:24 +01:00
Pako Natek 5d674139fa Merge branch '8408-Disponible-por-zonas-y-horas' of https://gitea.verdnatura.es/verdnatura/salix into 8408-Disponible-por-zonas-y-horas
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-10 14:00:36 +01:00
Pako Natek ec5ef3d7f8 fix(item_getStock): refs #8408 field availabled used for itementryin selection
Refs: #8408
2025-02-10 14:00:34 +01:00
Pako Natek f7f221e2bc Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-10 06:36:15 +00:00
Pako Natek b60f251c56 fix(catalog_calculate): refs #8408 remove comments
resf#8408
2025-02-10 07:34:15 +01:00
Guillermo Bonet 0ecf1f281a Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2025-02-10 07:27:04 +01:00
Guillermo Bonet a002168f61 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2025-02-10 07:26:53 +01:00
Guillermo Bonet 50a295d495 fix: refs #7162 Update JOIN condition for agencyMode in ticket_doCmr
gitea/salix/pipeline/head This commit looks good Details
2025-02-10 07:25:39 +01:00
Javier Segarra fce6b13d2d Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-07 16:19:58 +01:00
Pako Natek e22a21290b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8408-Disponible-por-zonas-y-horas 2025-02-07 14:37:20 +01:00
Pako Natek adf416a086 fix: refs #8408 hour time on catalog_calculate
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-07 14:29:50 +01:00
Guillermo Bonet ec3210a5c0 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2025-02-07 14:28:28 +01:00
Guillermo Bonet b1d2441d2e Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2025-02-07 14:27:56 +01:00
Guillermo Bonet 95d2823666 fix: refs #7024 Deleted dated check
gitea/salix/pipeline/head This commit looks good Details
2025-02-07 14:27:27 +01:00
Pako Natek 466a0a58d9 fix(catalog_calculate): refs #8408 delete commented lines
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
refs#8408
2025-02-07 12:59:41 +01:00
Pako Natek 74583d899a Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-07 11:53:30 +00:00
Pako Natek a4f3975340 feat(catalog_calculate): refs #8408 new concept availabled
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
Refs: #8408
2025-02-07 10:40:00 +01:00
Javier Segarra 35bf9abcf4 Merge branch 'dev' into 7601_futureAgency
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-06 16:15:27 +00:00
Javier Segarra 8398a30e4f Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-06 14:58:55 +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
Javier Segarra ab0667f85c feat: retrive requested fields
gitea/salix/pipeline/pr-dev Build queued... Details
2025-02-06 12:31:46 +00: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
Javier Segarra 1f6f7b9975 feat: refs #6321 updates requested
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-06 00:34:08 +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
Javier Segarra da90d43f7a Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-05 15:36:44 +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
Javier Segarra 0111373471 Merge branch 'dev' of https: refs #6321//gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-04 14:00:00 +01:00
Javier Segarra 550b0871f0 feat: refs #6321 changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-04 13:45:59 +01: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
Javier Segarra 410f3e73dc Merge branch 'dev' of https: refs #6321//gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-04 09:54:41 +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