 Juan Ferrer
|
beac086117
|
fix: refs #4409 Definer fixed, sync code clean
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-19 14:13:54 +01:00 |
|
Juan Ferrer
|
053d90b76a
|
fix: refs #4409 Parallel sync
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-19 14:07:02 +01:00 |
|
Juan Ferrer
|
6001f416d0
|
fix: refs #4409 First sync working version
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-19 12:56:42 +01:00 |
 Ivan Mas
|
c61ea07b6a
|
Merge branch 'dev' into 8558-futureTicketsClaims
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-19 11:30:08 +00:00 |
 Pako Natek
|
0cb3de872f
|
fix(available_refresh): refs #8408 availabled
gitea/salix/pipeline/pr-test There was a failure building this commit
Details
refs#8408
|
2025-02-19 08:10:01 +01:00 |
|
Juan Ferrer
|
72a651afa5
|
fix: refs #4409 vn.buyOut sequence
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-18 19:34:38 +01:00 |
|
Juan Ferrer
|
bd8af6172d
|
fix: refs #4409 Default life value
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-18 16:20:09 +01:00 |
|
Juan Ferrer
|
e98cc7daf2
|
fix: refs #4409 First working version
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-18 15:58:38 +01:00 |
 Carlos Andrés
|
b8a216444c
|
Actualizar db/routines/cache/procedures/available_refresh.sql
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-18 13:11:27 +00:00 |
 Alex Moreno
|
7ec29d1972
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-18 13:38:10 +01:00 |
|
Juan Ferrer
|
6162cbe2c6
|
fix: refs #4409 t.isRaid
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-18 11:06:41 +01:00 |
|
Carlos Andrés
|
5488a229c1
|
Merge pull request 'fix: priceOptimum error' (!3471) from PriceOptimum-error into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3471
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2025-02-18 08:50:27 +00:00 |
 Javier Segarra
|
1d9a6b5336
|
Merge branch 'dev' into fix_ticketNegative
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-18 08:26:55 +00:00 |
|
Alex Moreno
|
664ba03425
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-18 09:26:30 +01:00 |
 Jon Elias
|
d57d57b8f4
|
Merge branch 'dev' into fix_ticketNegative
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-18 08:17:35 +00:00 |
|
Alex Moreno
|
f83055057e
|
fix: expeditionTruck use editorFk
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-18 09:14:08 +01:00 |
|
Alex Moreno
|
669b7cd67f
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-18 08:45:19 +01:00 |
|
Alex Moreno
|
6e4667a563
|
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-02-18 08:45:11 +01:00 |
|
Alex Moreno
|
7d08c1796a
|
fix: update ticket_setState procedure to include created timestamp in ticketTracking insert
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-18 08:44:07 +01:00 |
|
Juan Ferrer
|
e9244c8538
|
Merge branch 'dev' into 4409-binlog
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-18 08:33:22 +01:00 |
|
Carlos Andrés
|
a73199e70b
|
fix: priceOptimum error
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-02-17 18:52:31 +01:00 |
|
Javier Segarra
|
f95da6d5de
|
Merge branch 'dev' into fix_ticketNegative
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-17 17:43:02 +00:00 |
|
Ivan Mas
|
60f31178cf
|
Merge branch 'dev' into 8558-futureTicketsClaims
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-17 14:17:31 +00:00 |
|
Ivan Mas
|
0088460e63
|
feat: refs #8558 requested modifications
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-17 15:15:11 +01:00 |
|
Pako Natek
|
991ed813e3
|
Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-17 12:15:48 +00:00 |
|
Pako Natek
|
bd1a4b35aa
|
fix(item_getBalance): refs #8408 alias for shipped field
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-17 13:12:22 +01:00 |
|
Carlos Andrés
|
52c22608a5
|
Actualizar db/routines/vn/procedures/productionControl.sql
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-17 11:38:48 +00:00 |
|
Javier Segarra
|
f7d953d392
|
fix: item_getLack
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-17 11:33:07 +01:00 |
|
Ivan Mas
|
472e52bc8c
|
feat: refs #8558 use shipped
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-14 15:03:58 +01:00 |
|
Ivan Mas
|
9cf6f8f031
|
feat: refs #8558 modify claim_beforeInsert
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-14 14:50:39 +01:00 |
|
Carlos Andrés
|
a874b96c5e
|
revert a119d9f7fb
gitea/salix/pipeline/head There was a failure building this commit
Details
revert feat: invoiceIn move deductible field from head to lines
|
2025-02-14 11:32:45 +00:00 |
|
Carlos Andrés
|
a119d9f7fb
|
feat: invoiceIn move deductible field from head to lines
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-14 12:29:56 +01:00 |
 Guillermo Bonet
|
309a287748
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-14 12:08:43 +01:00 |
|
Guillermo Bonet
|
aca49505bd
|
Merge branch 'test' into 8227-roadmapChanges
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2025-02-14 10:52:40 +00:00 |
|
Juan Ferrer
|
c954ebbb5d
|
feat: refs #4409 Small code fixes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-14 11:34:35 +01:00 |
|
Juan Ferrer
|
a615174d62
|
feat: refs #4409 buyLot_refresh INSERT IGNORE fix
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-14 10:46:29 +01:00 |
|
Juan Ferrer
|
53059f5bb5
|
feat: refs #4409 buyLot and buyLot refresh fixes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-14 10:21:02 +01:00 |
|
Guillermo Bonet
|
d6f08d7e27
|
feat: refs #8227 update roadmap triggers and views, remove obsolete trigger and column
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2025-02-14 10:04:04 +01:00 |
|
Alex Moreno
|
44ed6254c3
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-14 07:02:45 +01:00 |
|
Carlos Andrés
|
4e9bcf530b
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/pr-dev This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-13 18:59:26 +01:00 |
|
Carlos Andrés
|
7f32a10c06
|
fix: facturacion por consignatario en el cierre nocturno y unificación de backs
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-02-13 15:22:37 +01:00 |
|
Guillermo Bonet
|
845ce8d6d8
|
feat: refs #8227 Minor changes
gitea/salix/pipeline/pr-test There was a failure building this commit
Details
|
2025-02-13 14:36:09 +01:00 |
|
Guillermo Bonet
|
4042679c9b
|
feat: refs #8227 Grants
gitea/salix/pipeline/pr-test There was a failure building this commit
Details
|
2025-02-13 14:12:44 +01:00 |
|
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 |
|
Guillermo Bonet
|
bd53f7367c
|
Merge branch 'test' into 8227-roadmapChanges
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2025-02-13 08:34:20 +00:00 |
|
Guillermo Bonet
|
92ab3648e7
|
feat: refs #8227 Fix tests
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2025-02-13 09:22:45 +01: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 |
|
Juan Ferrer
|
3adc155b74
|
feat: refs #4409 buyLot and buyLot refresh refactor and fixes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-12 07:57:31 +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 |
|
Guillermo Bonet
|
75b6867be8
|
feat: refs #8227 Minor change
gitea/salix/pipeline/pr-test There was a failure building this commit
Details
|
2025-02-10 13:06:05 +01:00 |
|
Guillermo Bonet
|
e19e50de14
|
feat: refs #8227 Update roadmap triggers to manage eta adjustments and prevent recursive calls
gitea/salix/pipeline/pr-test There was a failure building this commit
Details
|
2025-02-10 13:04:23 +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 |
 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 |