Commit Graph

19109 Commits

Author SHA1 Message Date
Guillermo Bonet 10bfb7a7d7 fix: refs #5586 Minor change 2024-02-15 07:52:33 +01:00
Guillermo Bonet 05b7c37b94 fix: refs #5586 Rollback
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-15 07:49:17 +01:00
Guillermo Bonet 142c1bf7bd Merge branch 'dev' into 5586-optimizeNegativeBases
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 06:03:46 +00:00
Juan Ferrer 19bbb4a4bf fix: refs#6706 package.json deprecated scripts removed
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 17:20:04 +01:00
Juan Ferrer 27d7a114e6 fix: refs#6706 package.json dbtest script removed
gitea/salix/pipeline/head This commit looks good Details
2024-02-13 17:16:10 +01:00
Juan Ferrer a5d1597884 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-02-13 16:21:02 +01:00
Juan Ferrer 999d9a0f9c fix: refs#6706 E2E show parameter fix 2024-02-13 16:21:01 +01:00
Ivan Mas 11bbab6288 Merge pull request 'feat: refs #6830 item_getLack origin' (!2025) from 6830-item_getLackOrigin into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2025
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-02-13 13:14:02 +00:00
Ivan Mas add5fedc4e Merge branch 'dev' into 6830-item_getLackOrigin
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 13:12:02 +00:00
Guillermo Bonet 92261ebe0d fix: refs #5586 Tests fix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 13:09:12 +01:00
Guillermo Bonet bdc6192a7c refactor: refs #5586 Optimized SQL negativeBases
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-13 12:50:39 +01:00
Guillermo Bonet 42de1a7e51 Merge branch 'dev' into 5586-optimizeNegativeBases
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-13 12:29:46 +01:00
Jorge Penadés 9bd8c21660 Merge pull request '#6813 fix creditClient' (!2026) from 6813-fixCreditClient into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2026
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
2024-02-13 10:53:38 +00:00
Jorge Penadés 76b4f8f46f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6813-fixCreditClient
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 11:46:47 +01:00
Guillermo Bonet bf6d068830 Merge pull request 'refactor: refs #6781 Deleted timeControlDevice' (!2032) from 6781-timeControlDevice into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2032
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-02-13 10:16:43 +00:00
Jorge Penadés 579f2abe5b fix: refs #6813 remove quotation marks
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 11:16:00 +01:00
Jorge Penadés db2919b482 fix: refs #6813 procedure 2024-02-13 11:05:21 +01:00
Jorge Penadés d7fb31ee60 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6813-fixCreditClient
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 10:16:12 +01:00
Josep Domingo 51b336d9f7 Merge pull request 'refs#6685 RestoreViewCredit' (!2030) from 6685-fixRestoreViewCredit into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2030
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-02-13 09:00:03 +00:00
Josep Domingo 68034fc404 Merge branch 'dev' into 6685-fixRestoreViewCredit
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 08:56:05 +00:00
Juan Ferrer 4f9b46346f fix: refs#6706 back tests spec timeout reduced
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-13 09:49:33 +01:00
Guillermo Bonet bbb3f3807a Merge pull request 'fix: refs #6184 Minor change' (!2031) from 6184-externalCmr into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2031
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-02-13 08:45:03 +00:00
Guillermo Bonet b449da28ef Merge branch 'dev' into 6184-externalCmr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 08:42:31 +00:00
Jorge Penadés 995e249495 Merge pull request '#6106 where filter' (!2024) from 6106-fixSignView into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2024
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-02-13 08:42:14 +00:00
Guillermo Bonet 744171dd4c fix: refs #6184 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 09:41:26 +01:00
Jorge Penadés c8e13fa858 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6106-fixSignView
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 09:36:07 +01:00
Jorge Penadés 6116ada156 fix: refs #6813 remove inserts
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 09:35:39 +01:00
Guillermo Bonet 41db1c924f refactor: refs #6781 Deleted timeControlDevice
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 09:20:21 +01:00
Guillermo Bonet e08fb3d229 fix: refs #6184 Minor change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 08:59:58 +01:00
Josep Domingo 4feae72ee3 Merge branch 'dev' into 6685-fixRestoreViewCredit
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 07:58:41 +00:00
Josep Domingo 3b35e4dae8 refs#6685 RestoreViewCredit
gitea/salix/pipeline/pr-dev Build queued... Details
2024-02-13 08:57:49 +01:00
Josep Domingo 5b137ad825 Merge pull request 'feat: refs #6685 RestoreViewCredit' (!2028) from 6685-fixRestoreViewCredit into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2028
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-02-13 07:46:18 +00:00
Josep Domingo a897a05e8b feat: refs#6685RestoreViewCredit
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 07:52:09 +01:00
Guillermo Bonet 8f4b901818 Merge pull request 'refs #6184 saveCmr' (!1788) from 6184-saveCmr into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1788
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-02-13 06:47:05 +00:00
Guillermo Bonet 97f02187e3 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 07:35:07 +01:00
Ivan Mas 0ed5a0ff16 Merge pull request 'refs #6446 Delete function nz from db' (!2022) from 6446-Delete-function-nz-from-DB into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2022
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-02-12 12:56:05 +00:00
Ivan Mas 474c616b86 Merge branch 'dev' into 6446-Delete-function-nz-from-DB
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-12 12:54:21 +00:00
Jorge Penadés 534b5bb05a fix: refs #6106 where filter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-12 11:26:00 +01:00
Jorge Penadés d7e51e01a2 Merge pull request '#6379 fixDriverRouteEmail' (!2018) from 6379-fixDriverRouteEmail into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2018
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-02-12 07:46:55 +00:00
Jorge Penadés d60a95feaa fix: refs #6379 await & locale
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-12 08:34:25 +01:00
Jorge Penadés 80bae4fdac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6379-fixDriverRouteEmail 2024-02-12 08:31:59 +01:00
Ivan Mas b06f80e091 refs #6446 Delete function nz from db
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-12 08:11:49 +01:00
Sergio De la torre 278337dc97 Merge pull request 'refs #6651 feat:add urlImage' (!2015) from 6651_itemShelving_get into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2015
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-02-12 06:24:55 +00:00
Sergio De la torre 1f99450ecb Merge branch 'dev' into 6651_itemShelving_get
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-12 05:57:02 +00:00
Ivan Mas a0599403c8 Merge pull request 'fix: refs #6443 #6444 #6445 ChangeRevokeToGrant' (!2019) from 6443-6444-6445-fix-permissions into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2019
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-02-09 13:02:38 +00:00
Jorge Penadés 1be1990936 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6379-fixDriverRouteEmail
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-09 14:01:24 +01:00
Ivan Mas 222335809e Merge branch 'dev' into 6443-6444-6445-fix-permissions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-09 13:00:47 +00:00
Jorge Penadés e96b14ad04 Merge pull request '#6806 fix lastEntriesFilter' (!2013) from 6806-fixEntryFilter into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2013
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-02-09 12:47:17 +00:00
Jorge Penadés 9cf5edb26e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6379-fixDriverRouteEmail
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-09 13:45:33 +01:00
Jorge Penadés c3b0a8260a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6806-fixEntryFilter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-09 13:38:59 +01:00