Commit Graph

25610 Commits

Author SHA1 Message Date
Guillermo Bonet c3aeba16c1 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-11-27 13:00:02 +01:00
Guillermo Bonet 751314347a Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-11-27 12:59:41 +01:00
Guillermo Bonet 9c495ada13 fix: refs #7266 Minor changes x2
gitea/salix/pipeline/head This commit looks good Details
2024-11-27 12:59:27 +01:00
Guillermo Bonet 2231add129 fix: refs #7266 Minor changes
gitea/salix/pipeline/head This commit looks good Details
2024-11-27 12:58:32 +01:00
Jorge Penadés 8fd133c5e8 feat: refs #6818 define prefix model
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-27 12:51:09 +01:00
Guillermo Bonet e62553630c Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-11-27 10:41:31 +01:00
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
Jorge Penadés 3aaf5be48d Merge pull request 'fix: add IF NOT EXISTS to isRaid column in travel table' (!3253) from fix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3253
Reviewed-by: Jon Elias <jon@verdnatura.es>
2024-11-27 08:40:41 +00:00
Jorge Penadés 60a90bb090 fix: add IF NOT EXISTS to isRaid column in travel table
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-27 09:38:33 +01:00
Guillermo Bonet 05671be60e Merge pull request 'refactor: refs #8204 Deprecated itemShelvingLog' (!3249) from 8204-byeItemShelvingLog into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3249
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-11-27 05:50:44 +00: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 816a7f23e5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-11-26 14:18:19 +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
Guillermo Bonet 89d941c115 refactor: refs #8235 Deleted deprecated objects
gitea/salix/pipeline/head This commit looks good Details
2024-11-26 14:10:39 +01:00
Guillermo Bonet 10fe53b7f2 refactor: refs #8204 Deprecated itemShelvingLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-26 14:01:44 +01:00
Guillermo Bonet f8a79057b2 fix: refs #7899 Version
gitea/salix/pipeline/head This commit looks good Details
2024-11-26 13:42:33 +01:00
Ivan Mas f2b74794de Merge pull request 'refactor: refs #7899 delete unused states' (!3238) from 7899-deleteUnusedStates into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #3238
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-11-26 12:30:25 +00:00
Ivan Mas f32d709b9d Merge branch 'dev' into 7899-deleteUnusedStates
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-26 12:22:30 +00: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
Carlos Satorres 58cc28efaa fix: refs #4774 fix translation back
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-11-26 12:40:25 +01: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
Carlos Satorres 9a3934c572 Merge branch 'dev' of https: refs #4774//gitea.verdnatura.es/verdnatura/salix into 4774-translationsVn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-26 10:27:49 +01:00
Guillermo Bonet c14484366e Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-11-26 10:10:09 +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