Commit Graph

13441 Commits

Author SHA1 Message Date
Alex Moreno 8e758f5456 invoiceIn-disable-options
gitea/salix/pipeline/head This commit looks good Details
2022-11-18 06:36:30 +00:00
Joan Sanchez d7729654ee fix(ordersFilter): wrong table schema
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-17 16:48:31 +01:00
Joan Sanchez f501707adf fix(ordersFilter): wrong table schema
gitea/salix/pipeline/head This commit looks good Details
2022-11-17 16:47:01 +01:00
Joan Sanchez 721f89b76c fix(ordersFilter): wrong table schema
gitea/salix/pipeline/head This commit looks good Details
2022-11-17 16:39:12 +01:00
Vicent Llopis d4712e27c3 fix: no repite la llamada filter cada vez q cambias de seccion
gitea/salix/pipeline/head This commit looks good Details
2022-11-17 11:31:36 +01:00
Alexandre Riera 844eed55b6 Merge pull request 'fixes #4780 Quitar verificación de rol salesPerson del código' (!1156) from 4780-quitar-verificacion into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1156
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2022-11-17 10:30:00 +00:00
Alexandre Riera 4a063cc310 refs #4780 verification deleted
gitea/salix/pipeline/head This commit looks good Details
2022-11-17 09:25:18 +01:00
Alexandre Riera 153cb48ff0 fix test
gitea/salix/pipeline/head This commit looks good Details
2022-11-17 08:55:35 +01:00
Vicent Llopis 161886c936 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4832-refactor_workerTimeControl.sendMail
gitea/salix/pipeline/head This commit looks good Details
2022-11-17 07:22:26 +01:00
Pau 9257a02390 Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 13:34:49 +00:00
Pau f56c226fba Merge branch 'dev' into 4767-route.index-delete-route
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 13:32:32 +00:00
Alexandre Riera 566d384483 Merge branch '3557-back-missingTrash' of https://gitea.verdnatura.es/verdnatura/salix into 3557-back-missingTrash
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-16 13:46:20 +01:00
Alexandre Riera e4a6585b6a fix test back 2022-11-16 13:46:16 +01:00
Pau a733bc8c2f refs #4789 hasInvoice on ticket searchbar @3h30m
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 13:36:26 +01:00
Vicent Llopis 3d352fa0fd fix: locale no puede ser undefined
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 12:06:50 +01:00
Vicent Llopis b2e3d61954 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4793-models_translation 2022-11-16 11:53:47 +01:00
Alexandre Riera edb495c744 fix describe
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 11:52:35 +01:00
Alexandre Riera 489df60afc suggested filter added
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 11:10:00 +01:00
Pau 46af56922c Merge pull request 'fix(e2e test expected withoutNegatives checkbox to not be checked already)' (!1150) from fix-e2e-test-withoutNegatives into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1150
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2022-11-16 09:25:08 +00:00
Alexandre Riera 78dc7db7a7 correcciones
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 09:46:35 +01:00
Vicent Llopis 9bbaa7c718 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4793-models_translation
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 09:41:43 +01:00
Alexandre Riera 655338d79e Merge branch 'dev' into 3557-back-missingTrash
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-16 08:19:57 +00:00
Pau 34b189ea10 Merge branch 'dev' into fix-e2e-test-withoutNegatives
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 08:10:06 +00:00
Pau 67f8db6166 Merge pull request '4157-send-sms-to-routes' (!1106) from 4157-send-sms-to-routes into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1106
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-16 08:09:25 +00:00
Alex Moreno ccb0cfdf01 Merge branch 'dev' into fix-e2e-test-withoutNegatives
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-16 08:08:08 +00:00
Pau 7779059459 Merge branch 'dev' into 4157-send-sms-to-routes
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 08:05:19 +00:00
Pau 78ba047df0 Merge pull request '4492-item.create-same-as-item.isLaid' (!1125) from 4492-item.create-same-as-item.isLaid into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1125
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-16 08:04:53 +00:00
Pau 2a4af7ac78 Merge branch 'dev' into 4492-item.create-same-as-item.isLaid
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 07:29:09 +00:00
Pau b21d4b698e Merge branch 'dev' into 4157-send-sms-to-routes
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 07:29:03 +00:00
Pau a3f56f1622 Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 07:28:39 +00:00
Pau 7b3a1bfb22 requested changes
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 08:28:12 +01:00
Pau 66e6a47692 fix(e2e test expected withoutNegatives checkbox to not be checked already)
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-16 08:25:07 +01:00
Alexandre Riera 8d4d6fa94c Merge branch 'dev' into 3557-back-missingTrash
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-16 07:24:58 +00:00
Alex Moreno e32ddd9f44 Merge pull request 'remove-focus' (!1149) from remove-focus into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1149
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2022-11-16 07:17:08 +00:00
Alexandre Riera 7c8178b423 Merge branch 'dev' into 3557-back-missingTrash
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-16 07:07:20 +00:00
Alex Moreno 925c384622 Actualizar 'e2e/paths/05-ticket/02_expeditions_and_log.spec.js'
gitea/salix/pipeline/head This commit looks good Details
remove focus
2022-11-16 06:36:35 +00:00
Vicent Llopis 0089b821cf fix: corregido test intermitente
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 07:26:30 +01:00
Vicent Llopis 46c7aa24b8 fix: corregidas traducciones
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-16 07:14:45 +01:00
Pau d7dc7c4329 Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 06:08:01 +00:00
Vicent Llopis c200e1af32 refactor: optimizado select
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 15:09:41 +01:00
Pau 192d7336a4 change test
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 14:22:09 +01:00
Pau 6e58b1de8b refs #4511 Changed fixtures to fix broken test @30min
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 14:17:24 +01:00
Vicent Llopis dd8117b6a4 feat: añadidas traducciones
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 14:02:31 +01:00
Pau 56893ea58b Merge branch 'dev' into 4511-kkear-expedition.itemFk 2022-11-15 13:42:06 +01:00
Alexandre Riera 97a6aff499 fix workerFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 13:08:06 +01:00
Alexandre Riera 01607c71b6 fix rocket message and order table
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 13:03:55 +01:00
Vicent Llopis 284837083c feat: coge el idioma local
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 12:34:18 +01:00
Vicent Llopis fc516d4029 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 12:23:59 +01:00
Alex Moreno b57a64227b Merge pull request '3569-refactor_isEditable-canEdit' (!1082) from 3569-refactor_isEditable-canEdit into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1082
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2022-11-15 11:10:08 +00:00
Vicent Llopis 843e5ae736 feat: traducciones en los modelos
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 11:41:57 +01:00