Commit Graph

25375 Commits

Author SHA1 Message Date
Guillermo Bonet 55bf10435e Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-11-27 10:41:14 +01:00
Guillermo Bonet 0afae5c2d6 fix: refs #7266 Minor changes
gitea/salix/pipeline/head This commit looks good Details
2024-11-27 10:40:47 +01:00
Carlos Andrés c550f711c6 Actualizar db/routines/vn/triggers/travel_beforeUpdate.sql
gitea/salix/pipeline/head This commit looks good Details
2024-11-26 17:55:36 +00:00
Carlos Andrés ee2b5471e4 Merge pull request 'fix: hotfix entry_splitByShelving' (!3252) from HotfixEntry_splitByShelving into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3252
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-11-26 17:04:06 +00:00
Ivan Mas 10d2d4c9c4 fix: hotfix entry_splitByShelving
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-26 18:01:49 +01:00
Alex Moreno 93a0d4cdf4 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-11-26 14:18:06 +01:00
Alex Moreno 3c70dd77c9 Merge pull request 'build: dump db' (!3250) from 8231_dump into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3250
Reviewed-by: Jon Elias <jon@verdnatura.es>
2024-11-26 13:17:51 +00:00
Alex Moreno c66ae728d6 build: dump db
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-26 14:12:10 +01:00
Sergio De la torre f4f5ab2651 Merge branch 'master' into 8213-itemShelvingSalePicker
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-26 11:46:54 +00:00
Alex Moreno 45f7b60f1b Merge pull request 'fix: refs #7641 display buy.comment' (!3247) from 7641-hotfix-dropComment into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3247
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-11-26 11:26:48 +00:00
Jorge Penadés 00288e5a7f fix: refs #7641 display buy.comment
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-26 12:22:35 +01:00
Guillermo Bonet 6487497638 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-11-26 10:09:45 +01:00
Pablo Natek 7b3a08d222 Merge pull request 'fix: refs #8087 correct SQL join condition in entry_beforeUpdate trigger' (!3246) from 8087-correctFix into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3246
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-11-26 08:20:10 +00:00
Pablo Natek e6df9d426f fix: refs #8087 correct SQL query to use alias for isRaid in entry_beforeUpdate trigger
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-26 09:17:18 +01:00
Pablo Natek 3057d80e76 fix: refs #8087 correct SQL join condition in entry_beforeUpdate trigger
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-26 09:14:38 +01:00
Guillermo Bonet ed6f490188 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2024-11-26 09:11:38 +01:00
Guillermo Bonet 45e6d7f046 fix: refs #4948 ticket_selfConsumptionPackaging 2024-11-26 09:11:36 +01:00
Pablo Natek 5a050e2748 Merge pull request 'fix: refs #8087 correct SQL join condition in entry_beforeUpdate trigger' (!3245) from 8087-fixTrigger into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3245
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-11-26 08:09:43 +00:00
Robert Ferrús 43e39fd127 Merge branch 'master' into 8087-fixTrigger
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-26 08:08:13 +00:00
Robert Ferrús 56b0d254b8 Merge pull request 'fix: refs #8124 workCenterFk por commissionWorkCenterFk' (!3244) from hotFix2route_calcCommission into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3244
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2024-11-26 08:07:58 +00:00
Pablo Natek 0cbaac91c2 fix: refs #8087 correct SQL join condition in entry_beforeUpdate trigger
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-26 09:06:25 +01:00
Robert Ferrús 00353186e6 fix: refs #8124 workCenterFk por commissionWorkCenterFk
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-26 09:03:22 +01:00
Guillermo Bonet 2eed2f00a9 fix: refs #4948 ticket_selfConsumptionPackaging
gitea/salix/pipeline/head This commit looks good Details
2024-11-26 09:01:04 +01:00
Robert Ferrús 4fc3006298 Merge pull request 'fix: refs #8124 workCenter por workCenterFk' (!3243) from hotFixroute_calcCommission into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3243
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2024-11-26 07:36:57 +00:00
Robert Ferrús 35b508d3d6 fix: refs #8124 workCenter por workCenterFk
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-26 08:33:56 +01:00
Alex Moreno 1a11832281 Merge pull request '8231_testToMaster_2448' (!3241) from 8231_testToMaster_2448 into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3241
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-11-26 06:04:21 +00:00
Carlos Andrés d007e4f218 Actualizar db/versions/11363-silverCarnation/00-firstScript.sql
gitea/salix/pipeline/head This commit looks good Details
2024-11-25 17:53:44 +00:00
Carlos Andrés 26406b6fdb feat: refs #8124 Enrutadores nuevos requerimientos
gitea/salix/pipeline/head There was a failure building this commit Details
2024-11-25 18:45:37 +01:00
Sergio De la torre b0b64b2630 Merge pull request 'feat: refs #8213 refs#8213 picker ItemShelvingSale' (!3242) from 8213-itemShelvingSalePicker into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3242
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-11-25 15:22:55 +00:00
Sergio De la torre f6941928cd feat: refs #8213 refs#8213 picker ItemShelvingSale
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-25 16:20:25 +01:00
Sergio De la torre 0b5ef35d22 feat: refs #8213 refs#8213 picker ItemShelvingSale
gitea/salix/pipeline/pr-test This commit looks good Details
2024-11-25 16:16:47 +01:00
Alex Moreno ed39ae7e4b chore: refs #8231 add changelog
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-25 14:48:59 +01:00
Carlos Andrés 7cf6acec19 Merge pull request '8124-enrutadoresNuevosRequerimientos' (!3235) from 8124-enrutadoresNuevosRequerimientos into test
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
Reviewed-on: #3235
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-11-22 09:46:03 +00:00
Guillermo Bonet a731bb3a45 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-11-22 09:11:29 +01:00
Guillermo Bonet c73196edec fix: refs #7834 expeditionScan_Put no throw
gitea/salix/pipeline/head This commit looks good Details
2024-11-22 09:10:18 +01:00
Javier Segarra f01051a266 Merge pull request 'Revert ItemMigration and enbale in Salix (cd7ed6987a)' (!3236) from revert_7283_itemMigration3 into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3236
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-11-22 08:02:49 +00:00
Javier Segarra a6d2f9c3f8 Merge branch 'test' into revert_7283_itemMigration3
gitea/salix/pipeline/pr-test This commit looks good Details
2024-11-22 07:56:09 +00:00
Javier Segarra 0c592946e6 revert cd7ed6987a
gitea/salix/pipeline/pr-test This commit looks good Details
2024-11-21 20:24:33 +01:00
Carlos Andrés 52364bbe2d feat: refs #8124 Enrutadores nuevos requerimientos
gitea/salix/pipeline/pr-test This commit looks good Details
2024-11-21 18:44:47 +01:00
Carlos Andrés 7ad17d75d7 feat: refs #8124 Enrutadores nuevos requerimientos 2024-11-21 18:41:55 +01:00
Sergio De la torre fc75eae338 Merge pull request 'fix: refs #7855 refs#7855 isCheckedDeleted' (!3234) from 7855-expedition_printOut into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3234
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-11-21 15:37:56 +00:00
Sergio De la torre 5ac255ac52 fix: refs #7855 refs#7855 isCheckedDeleted
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-21 16:27:45 +01:00
Carlos Andrés 2563d1f0e4 Merge pull request 'refs#8087 Redadas en travel test' (!3232) from travelisRaidTest into test
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3232
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-11-21 14:55:07 +00:00
Carlos Andrés 0870a1c3d6 refs#8087 Redadas en travel test
gitea/salix/pipeline/pr-test This commit looks good Details
2024-11-21 15:09:58 +01:00
Sergio De la torre 07201f6448 Merge pull request 'fix: refs #7920 refs#7920 itemShelvingLog' (!3231) from 7920-itemShelvingLogs into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3231
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-11-21 10:59:52 +00:00
Sergio De la torre 512b4a54df fix: refs #7920 refs#7920 itemShelvingLog
gitea/salix/pipeline/pr-test This commit looks good Details
2024-11-21 11:28:25 +01:00
Carlos Satorres 7b177fa09f Merge pull request 'fix: hotfix errorMyTeam' (!3229) from hotfix-filterOrder into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3229
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-11-21 09:23:14 +00:00
Carlos Satorres 2978af8341 fix: hotfix errorMyTeam
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-21 10:18:17 +01:00
Sergio De la torre a8dea64bc1 Merge pull request 'fix: refs #7920 refs#7920 itemShelvingLog' (!3227) from 7920-itemShelvingLog into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #3227
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-11-20 13:07:51 +00:00
Sergio De la torre 9fbffe8a6b fix: refs #7920 refs#7920 itemShelvingLog
gitea/salix/pipeline/pr-test This commit looks good Details
2024-11-20 14:03:23 +01:00