Commit Graph

26925 Commits

Author SHA1 Message Date
Carlos Andrés 760cc3b09a fix: update mandate_afterDelete trigger to log actions in clientLog and drop mandateLog table
gitea/salix/pipeline/pr-master This commit looks good Details
2025-03-06 14:11:48 +01:00
Carlos Andrés 00f4fdf3f0 fix: update clientLog table to specify schema in SQL script
gitea/salix/pipeline/pr-master This commit looks good Details
2025-03-06 13:17:09 +01:00
Carlos Andrés b29e9a881e fix: update changedModel column in clientLog table to use ENUM and set default value 2025-03-06 13:16:33 +01:00
Alex Moreno daef11e48f fix: change JOIN to LEFT JOIN for user in expedition state query
gitea/salix/pipeline/head This commit looks good Details
2025-03-06 07:36:56 +01:00
Javier Segarra bb69354e45 Merge pull request 'fix: newWorker' (!3522) from hotfix-newWorker into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3522
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-03-05 21:46:02 +00:00
Javier Segarra 7727f5e103 Merge branch 'master' into hotfix-newWorker
gitea/salix/pipeline/pr-master This commit looks good Details
2025-03-05 21:42:06 +00:00
Carlos Andrés cae4192098 Merge pull request 'fix: casting' (!3538) from Hotfix-available-for-item_getLack into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3538
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2025-03-05 14:08:27 +00:00
Pako Natek 5cef80e981 fix: casting
gitea/salix/pipeline/pr-master This commit looks good Details
2025-03-05 15:05:09 +01:00
Carlos Andrés 6706e47481 Merge pull request 'fix: shipment' (!3536) from Hotfix-available-for-item_getLack into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3536
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2025-03-05 13:17:18 +00:00
Pako Natek f0b5044b65 fix: shipment
gitea/salix/pipeline/pr-master This commit looks good Details
2025-03-05 14:14:26 +01:00
Javier Segarra f0033e2654 Merge pull request 'Hotfix[AccountRoutes]: Rollback deleted routes to redirect to Lilium' (!3535) from Hotfix-RedirectToUserSummary into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3535
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-03-05 13:05:26 +00:00
Jon Elias b7d49af2c2 Merge branch 'master' into Hotfix-RedirectToUserSummary
gitea/salix/pipeline/pr-master This commit looks good Details
2025-03-05 13:02:00 +00:00
Pako Natek 8e14d1e1e2 Merge pull request 'fix: update item_getMinacum procedure to include vTime parameter and adjust date calculations' (!3534) from Hotfix-available-for-item_getLack into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3534
Reviewed-by: Pako Natek <pako@verdnatura.es>
2025-03-05 12:46:45 +00:00
Pako Natek 5959a9e9e0 fix: sin foco
gitea/salix/pipeline/pr-master This commit looks good Details
2025-03-05 13:45:25 +01:00
Pako Natek 9ee40a4931 fix: lost vDated
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2025-03-05 13:44:08 +01:00
Pako Natek f95e0cacdb fix(item_getInfo): modified availabled
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2025-03-05 13:40:26 +01:00
Carlos Andrés 4680128b8f feat: add time parameter to item_getLack procedure and update related queries
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2025-03-05 13:31:05 +01:00
Jon Elias 7f69a343c1 Merge branch 'master' into Hotfix-RedirectToUserSummary
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2025-03-05 12:16:47 +00:00
Jon Elias e9aae88ba2 fix: rollback deleted routes to redirect to Lilium
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2025-03-05 13:13:14 +01:00
Carlos Andrés 68c028669d fix: update item_getMinacum procedure to include vTime parameter and adjust date calculations
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2025-03-05 11:32:27 +01:00
Guillermo Bonet 5ae36641df fix: refs #7882 Change longitude and latitude types to any in createAddress method
gitea/salix/pipeline/head This commit looks good Details
2025-03-05 11:27:59 +01:00
Carlos Andrés dfe5735903 Actualizar db/routines/vn/procedures/item_getLack.sql
gitea/salix/pipeline/head This commit looks good Details
2025-03-04 15:02:54 +00:00
Alex Moreno 70446fd13f feat(salesFilter): add isFragile column to sales filter query
gitea/salix/pipeline/head This commit looks good Details
2025-03-04 14:57:52 +01:00
Carlos Andrés 49cc86fea9 Actualizar db/routines/vn/procedures/item_getBalance.sql
gitea/salix/pipeline/head This commit looks good Details
2025-03-04 13:48:23 +00:00
Carlos Andrés 1632da06ca Actualizar db/routines/vn/procedures/item_getBalance.sql
gitea/salix/pipeline/head This commit looks good Details
2025-03-04 12:18:17 +00:00
Guillermo Bonet d14937fd64 fix: refs #7956 item_getSimilar
gitea/salix/pipeline/head This commit looks good Details
2025-03-04 12:50:07 +01:00
Pako Natek 539a7f375f Merge pull request 'fix(priceDelta): removes not null restriction for itemTypeFk' (!3529) from hotfix-master-priceDelta into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3529
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2025-03-04 11:11:15 +00:00
Pako Natek 8eefcf53d0 fix(priceDelta): removes not null restriction for itemTypeFk
gitea/salix/pipeline/pr-master This commit looks good Details
refs#8674
2025-03-04 11:51:15 +01:00
Jon Elias ff977de929 Merge pull request 'Hotfix[MonitorSalesFilter]: Fix filtering' (!3525) from Hotfix-MonitorFilter into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3525
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-04 10:41:56 +00:00
Jon Elias d7f06b7df9 fix: fixed salesFilter test
gitea/salix/pipeline/pr-master This commit looks good Details
2025-03-04 10:33:48 +01:00
Jon Elias 729185f921 fix: fix salesFilter excluding ticket filtered
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2025-03-04 10:25:19 +01:00
Carlos Andrés c4c606018d Merge pull request 'fixlostTestMaster' (!3524) from fixlostTestMaster into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3524
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-04 08:55:34 +00:00
Carlos Andrés 10a2dc484b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into fixlostTestMaster
gitea/salix/pipeline/pr-master This commit looks good Details
2025-03-04 09:50:04 +01:00
Carlos Andrés dd0bcd66cf fix: comment out time adjustment logic in beforeInsert and beforeUpdate triggers 2025-03-04 09:45:24 +01:00
Carlos Andrés 06068c41c9 Actualizar db/routines/vn/procedures/item_getMinacum.sql
gitea/salix/pipeline/head This commit looks good Details
2025-03-04 08:38:44 +00:00
Carlos Andrés b7d972593a Actualizar db/routines/vn/procedures/item_getBalance.sql
gitea/salix/pipeline/head This commit looks good Details
2025-03-04 08:36:35 +00:00
Carlos Andrés 3b1e906a87 Actualizar db/routines/vn/procedures/item_getStock.sql
gitea/salix/pipeline/head This commit looks good Details
2025-03-04 08:20:30 +00:00
Carlos Andrés 8e82a6d0f1 Actualizar db/routines/cache/procedures/available_refresh.sql
gitea/salix/pipeline/head This commit looks good Details
2025-03-04 08:03:59 +00:00
Alex Moreno 2037c3d1fb build: dump db
gitea/salix/pipeline/head This commit looks good Details
2025-03-04 08:51:41 +01:00
Alex Moreno 80a27e44d9 Merge pull request '8713-testToMaster' (!3523) from 8713-testToMaster into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3523
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2025-03-04 06:52:13 +00:00
Carlos Andrés 4605a26b1f fix: comment out shipping time adjustments in beforeInsert and beforeUpdate triggers
gitea/salix/pipeline/pr-test This commit looks good Details
2025-03-04 07:41:04 +01:00
Carlos Satorres ec7cfc51c5 Merge branch 'master' into hotfix-newWorker
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2025-03-03 14:36:01 +00:00
Carlos Satorres ea38e8916f fix: newWorker
gitea/salix/pipeline/pr-master Build queued... Details
2025-03-03 15:34:48 +01:00
Alex Moreno 75f5888741 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2025-03-03 14:44:21 +01:00
Carlos Andrés 6861f2d4a0 Merge pull request '8700_invoiceOut' (!3513) from 8700_invoiceOut into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3513
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-03-03 13:12:14 +00:00
Pako Natek 892c95f5f0 feat(availabled): refs #8048
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2025-03-03 14:01:30 +01:00
Pako Natek 8cc88453c4 fix(travel): new trigger for travel and new version to update it
stockRefresh and entryIn also updated

Refs: #8048
2025-03-03 13:29:20 +01:00
Javier Segarra 3adcdeae82 Merge pull request 'fix: hotfix back' (!3517) from hotfix-7830AddresType into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3517
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-03-03 11:39:59 +00:00
Pako Natek 99bc9b4698 fix(catalog_calculate): improves new option for not itemtype selected
Refs: #8674
2025-03-03 11:50:34 +01:00
Carlos Satorres 5363a368de fix: hotfix back
gitea/salix/pipeline/pr-master This commit looks good Details
2025-03-03 11:39:05 +01:00