Commit Graph

2105 Commits

Author SHA1 Message Date
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 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
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
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
Pako Natek 99bc9b4698 fix(catalog_calculate): improves new option for not itemtype selected
Refs: #8674
2025-03-03 11:50:34 +01:00
Carlos Andrés bbcdff2c31 feat: refs #8700 update invoiceOut procedure to use new serial and ref handling; modify foreign key constraints
gitea/salix/pipeline/pr-master This commit looks good Details
2025-03-02 11:13:09 +01:00
Pako Natek 1b3e5a2576 feat(catalog_calculate): refs #8674 new field and modified proc
gitea/salix/pipeline/pr-master This commit looks good Details
Refs: #8674
2025-02-26 12:20:39 +01:00
Pako Natek a80614a46d feat(catalog_calculate): refs #8674 refs#8674
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-26 12:18:55 +01: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
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
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
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
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
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
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
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
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