 Javier Segarra
|
5df24d0e70
|
Merge pull request '#6321 - Negative tickets' (!1945) from 6321_negative_tickets into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1945
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2025-02-11 08:45:32 +00: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
|
0bd345b6de
|
Merge pull request '8408-Disponible-por-zonas-y-horas' (!3432) from 8408-Disponible-por-zonas-y-horas into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3432
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2025-02-11 07:50:15 +00:00 |
|
Pako Natek
|
b4fe620f2e
|
Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-11 07:47:16 +00:00 |
|
Pako Natek
|
5a8f7b2c1a
|
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-11 08:46:26 +01:00 |
|
Pako Natek
|
fbf56ff0cf
|
fix(available_refresh): refs #8408 more availabled cases
refs#8408
|
2025-02-11 08:46:24 +01:00 |
|
Pako Natek
|
cdb91c06c2
|
Merge pull request '8408-Disponible-por-zonas-y-horas' (!3431) from 8408-Disponible-por-zonas-y-horas into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3431
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2025-02-11 07:16:38 +00:00 |
|
Pako Natek
|
1a92a00cce
|
Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-11 07:12:25 +00: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
|
4d5d38592f
|
Merge pull request 'feat(catalog_calculate): refs #8408 new concept availabled' (!3425) from 8408-Disponible-por-zonas-y-horas into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3425
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2025-02-10 06:47:01 +00: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
|
17749b0ced
|
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 07:34:19 +01: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
|
e748c3ea68
|
feat: refs #6321 minor changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-07 22:40:00 +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 |
|
Javier Segarra
|
9bb273807d
|
feat: refs #6321 i18n negativeReplaced
|
2025-02-07 16:18:26 +01:00 |
|
Guillermo Bonet
|
08140894a8
|
Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-07 14:06:28 +00:00 |
|
Guillermo Bonet
|
d7a25b06bf
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-07 15:05:41 +01:00 |
|
Guillermo Bonet
|
8261b35559
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-07 15:05:20 +01:00 |
|
Guillermo Bonet
|
b56468d3aa
|
fix: refs #7024 Test
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-07 15:05:04 +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
|
ca39edd010
|
fix: refs #8408 test
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-07 14:04:17 +01:00 |
 Jon Elias
|
f04933a9c1
|
Merge pull request 'Fix[ItemFixedPrice]: Fixed item name filter' (!3427) from Hotfix-FixedPriceNameFilter into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3427
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2025-02-07 12:44:42 +00:00 |
|
Jon Elias
|
516f409ae5
|
Merge branch 'dev' into Hotfix-FixedPriceNameFilter
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-07 12:42:20 +00:00 |
|
Jon Elias
|
d76db10e67
|
fix: fixed item name filter
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-07 13:39:53 +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
|
ba323bb7bf
|
fix(fixtures.before): refs #8408 rollback changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
refs#8408
|
2025-02-07 12:53:15 +01:00 |
 Carlos Andrés
|
f851a0b73b
|
Merge pull request 'HOTFIX: before save checkAccessAcl' (!3426) from hotfix_client_beforeSave_ACL into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3426
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2025-02-07 10:18:43 +00:00 |
|
Javier Segarra
|
23134deab5
|
fix: before save checkAccessAcl
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-02-07 11:11:22 +01:00 |
|
Guillermo Bonet
|
21d9369250
|
fix: refs #8172 Version fix
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-07 11:04:10 +01: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 |
|
Guillermo Bonet
|
1a274648a7
|
Merge pull request 'refactor: refs #8172 Created table parkingCoordinates' (!3320) from 8172-parkingCoordinates into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3320
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
|
2025-02-07 09:38:55 +00:00 |
|
Guillermo Bonet
|
6fd1c35819
|
Merge branch 'dev' into 8172-parkingCoordinates
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-07 10:36:35 +01:00 |
|
Javier Segarra
|
f4dbddbe15
|
fix: refs #6321 dates in fixtures.before
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-07 09:54:55 +01:00 |
|
Javier Segarra
|
ef4d639499
|
Merge pull request '#7601 - Different agency fot future tickets' (!3420) from 7601_futureAgency into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3420
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2025-02-07 08:32:47 +00:00 |
|
Javier Segarra
|
9322360979
|
fix: refs #6321 dates in fixtures.before
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-07 08:41:49 +01:00 |
|
Jon Elias
|
18fe468623
|
Merge pull request 'Hotfix[InvoiceOutList]: Fixed company filter' (!3424) from Hotfix-InvoiceOutCompanyFilter into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3424
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2025-02-07 07:12:33 +00:00 |
|
Javier Segarra
|
47c3878a74
|
Merge branch 'dev' into 7601_futureAgency
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-07 07:06:54 +00:00 |
|
Javier Segarra
|
e035a73e06
|
feat: refs #6321 i18n es negativeReplaced
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-07 07:57:10 +01:00 |
|
Jon Elias
|
a6de493271
|
Merge branch 'master' into Hotfix-InvoiceOutCompanyFilter
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-02-07 06:56:49 +00:00 |
|
Javier Segarra
|
d185530839
|
Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-07 07:56:05 +01:00 |