Commit Graph

25531 Commits

Author SHA1 Message Date
Guillermo Bonet a8d378a4be Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-12-02 06:59:22 +01:00
Guillermo Bonet a17e434df1 fix: refs #7266 Buy label barcode, minor barcode width
gitea/salix/pipeline/head This commit looks good Details
2024-12-02 06:59:01 +01:00
Guillermo Bonet 3453aa0f8c Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-11-29 11:40:22 +01:00
Guillermo Bonet 3b73ffbd8a Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-11-29 11:40:05 +01:00
Sergio De la torre 76b12e73b9 Merge pull request 'fix: refs #7920 refs#7920 itemShelvingLogs' (!3263) from 7920-itemShelvingsLog into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3263
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-11-29 10:38:30 +00:00
Sergio De la torre 009b4ab7b9 fix: refs #7920 refs#7920 itemShelvingLogs
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-29 11:31:31 +01:00
Alex Moreno 20b68b4b41 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-11-29 07:28:55 +01:00
Alex Moreno b48beaf4b3 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-11-29 07:28:24 +01:00
Carlos Andrés 97cdadac78 Merge pull request 'fix: refs #8221 duaInvoiceIn unique' (!3256) from 8221-duaInvoiceInUnique into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3256
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-11-28 17:58:39 +00:00
Ivan Mas df51b93e5b Merge branch 'dev' into 7146-route.createdToDated
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-28 16:32:03 +00:00
Ivan Mas 6d315bf84d refactor: refs #7146 route.created to route.dated
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-28 17:29:39 +01:00
Alex Moreno d6a849727e fix: fix result test
gitea/salix/pipeline/head This commit looks good Details
2024-11-28 13:11:43 +01:00
Alex Moreno 838296e744 fix: add expected message result
gitea/salix/pipeline/head This commit looks good Details
2024-11-28 13:02:58 +01:00
Alex Moreno 6785779fe5 fix: add console log
gitea/salix/pipeline/head This commit looks good Details
2024-11-28 12:26:03 +01:00
Alex Moreno e730b5d4a1 fix: add debugAdd response axios
gitea/salix/pipeline/head This commit looks good Details
2024-11-28 11:53:42 +01:00
Alex Moreno 5923916cda fix: change debugAdd to console.error
gitea/salix/pipeline/head This commit looks good Details
2024-11-28 11:31:38 +01:00
Pablo Natek c8b0874e95 Merge pull request 'fix: refs #7404 add debug logging for cancelShipment and deleteExpeditions methods' (!3258) from 7404-add-debug into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3258
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-11-28 10:24:57 +00:00
Alex Moreno 8ef78818db Merge branch 'master' into 7404-add-debug
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-28 10:19:32 +00:00
Pablo Natek 00e5f86020 fix: refs #7404 add debug logging for cancelShipment and deleteExpeditions methods
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-28 11:18:09 +01:00
Guillermo Bonet 699c6553a0 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-11-28 11:17:19 +01:00
Guillermo Bonet 46bd033336 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-11-28 11:16:58 +01:00
Guillermo Bonet 51d96a89c5 fix: refs #7266 Increased size item id buy-label
gitea/salix/pipeline/head This commit looks good Details
2024-11-28 11:15:58 +01:00
Jorge Penadés eb97f6ef5f Merge pull request 'feat: refs #6818 define prefix model' (!3254) from 6818-hotfix-definePrefix into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3254
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-11-28 08:50:01 +00:00
Jorge Penadés 5ee4563ee7 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6818-hotfix-definePrefix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-28 09:38:28 +01:00
Pablo Natek 1d59d4eeef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8004-liliumStyleRemake
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-28 09:34:36 +01:00
Pablo Natek d5693291f0 refactor: refs #8004 simplify SQL query by removing redundant aliases 2024-11-28 09:24:02 +01:00
Guillermo Bonet 71bc1adcba Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-11-28 09:00:38 +01:00
Guillermo Bonet ca4244527b Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-11-28 09:00:24 +01:00
Guillermo Bonet 847692f103 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2024-11-28 08:59:11 +01:00
Guillermo Bonet 93388461d1 fix: refs #7266 Changed method name and corrections 2024-11-28 08:59:08 +01:00
Sergio De la torre cf237a1dd7 Merge pull request '8213-itemShelvingSalePicker' (!3248) from 8213-itemShelvingSalePicker into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3248
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-11-28 07:51:35 +00:00
Sergio De la torre 6f1bfd6787 Merge branch 'master' into 8213-itemShelvingSalePicker
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-28 07:50:06 +00:00
Alex Moreno 65c994e9d6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-11-28 08:42:36 +01:00
Alex Moreno 34348f50e8 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-11-28 08:42:24 +01:00
Carlos Andrés 30cc7a49a0 Actualizar modules/entry/back/methods/entry/print.js
gitea/salix/pipeline/head This commit looks good Details
2024-11-27 15:38:50 +00:00
Carlos Andrés d872f164fd Actualizar modules/entry/back/models/entry.js
gitea/salix/pipeline/head This commit looks good Details
2024-11-27 14:55:30 +00:00
Carlos Andrés 15c755087c fix: refs #8221 duaInvoiceIn unique
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-27 14:28:50 +01:00
Jorge Penadés bab5a4fadb Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6818-hotfix-definePrefix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-27 13:09:29 +01:00
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