Commit Graph

21561 Commits

Author SHA1 Message Date
Javier Segarra fe4c529bfe refs #5834 perf: remove front code
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-12 13:05:00 +01:00
Javier Segarra 3ace078705 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5834-billingDataAutoFillBic
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-12 12:53:49 +01:00
Alex Moreno 199656afb8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-12 12:41:52 +01:00
Jorge Penadés c309f52c6f Merge pull request 'fix: refs #6656 change acls' (!1929) from 6656-hotfix-workerTimeControl into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1929
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-01-12 11:24:11 +00:00
Carlos Satorres 1ca49d064e Merge pull request 'refs #6353 remove rating' (!1923) from 6353-ratingCatalog into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1923
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-01-12 10:36:43 +00:00
Jorge Penadés 2a6b509a78 fix: refs #6656 change acls
gitea/salix/pipeline/head This commit looks good Details
2024-01-12 09:54:18 +01:00
Alex Moreno 14fff571b5 Merge branch 'dev' into 6353-ratingCatalog
gitea/salix/pipeline/head This commit looks good Details
2024-01-12 08:52:51 +00:00
Carlos Satorres c0c3d913b7 refs #5919 locker
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-12 09:03:54 +01:00
Carlos Satorres b7a523074f Merge pull request 'refs #6322 importe' (!1921) from 6322-futureTicketImporte into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1921
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-01-12 07:55:18 +00:00
Carlos Satorres d0df880c32 Merge branch 'dev' into 6322-futureTicketImporte
gitea/salix/pipeline/head This commit looks good Details
2024-01-12 07:47:23 +00:00
Jorge Penadés ddcecb8f22 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-11 16:52:54 +01:00
Javi Gallego 887f686767 Merge pull request '3979-abonarTicketsSinAlmacen' (!1910) from 3979-abonarTicketsSinAlmacen into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1910
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-01-11 12:39:27 +00:00
Alex Moreno b1530d049e refs #6398 hotFix: use userFk
gitea/salix/pipeline/head This commit looks good Details
2024-01-11 13:29:03 +01:00
Javi Gallego c98baf21bf Merge branch 'dev' into 3979-abonarTicketsSinAlmacen
gitea/salix/pipeline/head This commit looks good Details
2024-01-11 12:17:59 +00:00
Juan Ferrer 46fe878f45 Merge pull request 'refs #6660 feat: update mariadb version 10.7.7→10.11.6' (!1926) from 6660-mariadbV10.11.6 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1926
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-01-11 11:28:13 +00:00
Juan Ferrer ce5e8c278f Merge branch 'dev' into 6660-mariadbV10.11.6
gitea/salix/pipeline/head This commit looks good Details
2024-01-11 11:22:55 +00:00
Guillermo Bonet e2fd55d9fb Merge pull request 'fix: ticket 147437: Fix packages in incoterms' (!1927) from ticket147437-fixPackages into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1927
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-01-11 10:46:12 +00:00
Guillermo Bonet 4673145c58 fix: ticket 147437: Fix packages in incoterms
gitea/salix/pipeline/head This commit looks good Details
2024-01-11 10:09:35 +01:00
Jorge Penadés c61f5a67b6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-11 09:28:24 +01:00
Alex Moreno 9b15551013 refs #6675 fix: correct sql folder
gitea/salix/pipeline/head This commit looks good Details
2024-01-11 09:00:45 +01:00
Alex Moreno a92297da73 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-01-11 08:14:56 +01:00
Javier Segarra 93f80718d8 Merge pull request 'Send message to comercial by RocketChat' (!1897) from 5499_claim_rocketMessage_comercial into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1897
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-01-11 07:00:12 +00:00
Javier Segarra b76e269e73 refs #5499 perf: rename variable
gitea/salix/pipeline/head This commit looks good Details
2024-01-11 06:18:02 +00:00
Alex Moreno edde5819e3 refs #6660 feat: update mariadb version 10.7.7→10.11.6
gitea/salix/pipeline/head This commit looks good Details
2024-01-10 15:39:35 +01:00
Javier Segarra c11bcbebee refs #5878 perf: handle when create customer 2024-01-10 14:51:59 +01:00
Javier Segarra de4ddf9392 remove bad comment
gitea/salix/pipeline/head This commit looks good Details
2024-01-10 13:47:42 +00:00
Pablo Natek fd0ee6b7a2 Merge pull request 'fix(ticketTracking): refs #6398 assign ticket workerFk to userFk' (!1924) from 6398-ticketTrackingAsignFix into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1924
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-01-10 13:04:24 +00:00
Pablo Natek a623e5b90e Merge branch '6398-ticketTrackingAsignFix' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTrackingAsignFix
gitea/salix/pipeline/head This commit looks good Details
2024-01-10 13:55:03 +01:00
Pablo Natek dff277ed12 fix(spec): refs #6398 fix spec 2024-01-10 13:55:01 +01:00
Pablo Natek 5d63b4fba8 Merge branch 'master' into 6398-ticketTrackingAsignFix
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-10 12:51:33 +00:00
Pablo Natek df13fa3c88 fix(selector): refs #6398 change selector name
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-10 13:35:34 +01:00
Pablo Natek 63b20c1e91 fix(ticketTracking): refs #6398 assign ticket workerFk to userFk
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-10 13:12:12 +01:00
Guillermo Bonet 2d93452bda Merge pull request 'fix: refs #6582 Traductions routesMonitor' (!1922) from 6582-routesMonitorTraduction into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1922
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-01-10 09:12:55 +00:00
Carlos Satorres 980ca81bfc refs #6353 fixtures catalog rating
gitea/salix/pipeline/head This commit looks good Details
2024-01-10 09:38:20 +01:00
Guillermo Bonet 2b0e5e9d04 Merge branch 'master' into 6582-routesMonitorTraduction
gitea/salix/pipeline/head This commit looks good Details
2024-01-10 08:20:39 +00:00
Carlos Satorres 877dc718a7 refs #6353 remove rating
gitea/salix/pipeline/head This commit looks good Details
2024-01-10 08:57:19 +01:00
Sergio De la torre 147dc2e5f1 Merge pull request '6275-hotFix-version_not_applied' (!1918) from 6275-hotFix-version_not_applied into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1918
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-01-10 07:22:54 +00:00
Javier Segarra 21566fd7ba refs #5499 code: remove unused translations
gitea/salix/pipeline/head This commit looks good Details
2024-01-10 07:50:29 +01:00
Javier Segarra 7cc454751e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5499_claim_rocketMessage_comercial
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-10 07:48:11 +01:00
Javier Segarra 1bd6751d56 refs #5499 revert 2024-01-10 07:46:11 +01:00
Alex Moreno d2f7b82ace Merge branch 'master' into 6275-hotFix-version_not_applied
gitea/salix/pipeline/head This commit looks good Details
2024-01-10 06:39:40 +00:00
Carlos Satorres 6647649f5e Merge pull request 'refs #6291 validateTin' (!1836) from 6291-comprobarDNI into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1836
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-01-09 14:03:17 +00:00
Guillermo Bonet 783436e8d2 fix: refs #6582 Traductions routesMonitor
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-09 15:02:58 +01:00
Carlos Satorres 55f9519ebd Merge branch 'dev' into 6291-comprobarDNI
gitea/salix/pipeline/head This commit looks good Details
2024-01-09 13:59:48 +00:00
Guillermo Bonet 510a395ef2 Merge pull request 'refactor: refs #6410 Deleted dmsType.path' (!1919) from 6410-dmsTypePath into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1919
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-01-09 13:53:16 +00:00
Carlos Satorres 16d7a20798 Merge branch 'dev' into 6291-comprobarDNI
gitea/salix/pipeline/head This commit looks good Details
2024-01-09 13:49:31 +00:00
Guillermo Bonet 08aaf660e2 Merge branch 'dev' into 6410-dmsTypePath
gitea/salix/pipeline/head This commit looks good Details
2024-01-09 13:33:01 +00:00
Guillermo Bonet 81ffc122fc Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-01-09 14:09:47 +01:00
Guillermo Bonet 9a82fbea05 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-01-09 14:07:32 +01:00
Guillermo Bonet 5d4c106825 fix: refs #5848 Added flag DONT_EXPIRE_PASSWD
gitea/salix/pipeline/head This commit looks good Details
2024-01-09 13:59:11 +01:00