Commit Graph

17797 Commits

Author SHA1 Message Date
Pau 7475aa8389 Merge branch 'dev' into 3681-move-sign_save-to-salix
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-21 08:33:51 +00:00
Pau 68e4eea2e3 Merge branch 'dev' into 4767-route.index-delete-route
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-21 08:32:39 +00:00
Pau 153f5f56fa fix test refs #4791 @30min
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 09:11:17 +01:00
Vicent Llopis 3fde11c3ed Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-21 08:06:39 +00:00
Pau 4e97d931f7 refs #4791 @2h 2022-11-21 08:45:45 +01:00
Alex Moreno 7e98a255b8 refs #4849 SQL
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-21 08:11:01 +01:00
Joan Sanchez 1f857d5b10 4859 - Export production database
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-21 08:01:21 +01:00
Vicent Llopis 83aec89adb Merge pull request 'fixed 4832-refactor_workerTimeControl.sendMail' (!1147) from 4832-refactor_workerTimeControl.sendMail into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1147
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-21 06:41:52 +00:00
Vicent Llopis 4c4482c40a Merge branch 'dev' into 4832-refactor_workerTimeControl.sendMail
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 06:09:05 +00:00
Pau c320342476 Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-21 06:05:43 +00:00
Joan Sanchez 813cf78128 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-18 14:03:09 +00:00
Pau 0f17c082a3 refs #4557 @1h left join note only delivery
gitea/salix/pipeline/head This commit looks good Details
2022-11-18 12:07:33 +01:00
Pau d41269bbbe Change fixtures so the provider is present in the label
gitea/salix/pipeline/head This commit looks good Details
2022-11-18 11:58:46 +01:00
Pau 99eea1df1d refs #4732 @1h
gitea/salix/pipeline/head This commit looks good Details
2022-11-18 11:46:49 +01:00
Pau bc5940b036 Label show provider 2022-11-18 11:46:13 +01:00
Joan Sanchez 3d3a317b52 Merge pull request 'MASTER fix: use vn email' (!1159) from hotFix_useVerdnaturaEmail into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1159
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-18 09:42:13 +00:00
Alex Moreno f8e6b71bc6 typo
gitea/salix/pipeline/head This commit looks good Details
2022-11-18 10:27:05 +01:00
Alex Moreno 77b2f9cbd9 user emailUser
gitea/salix/pipeline/head This commit looks good Details
2022-11-18 10:25:25 +01:00
Alex Moreno d70d848717 fix: use vn email
gitea/salix/pipeline/head This commit looks good Details
2022-11-18 09:57:07 +01:00
Alexandre Riera a952fc0330 space fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-11-18 09:38:22 +01:00
Alexandre Riera 67f0346980 space fixtures
gitea/salix/pipeline/head Build queued... Details
2022-11-18 09:37:38 +01:00
Alexandre Riera fd58eaf838 drop procedure
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-18 09:36:38 +01:00
Alex Moreno ef6af87d89 feat: add supplier.isVies funcionality
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-18 09:21:21 +01:00
Pau 65fd5e2c8f Possible change? 2022-11-18 08:51:17 +01:00
Alex Moreno 0dfdcda1a6 Merge pull request 'invoiceIn-disable-options' (!1158) from invoiceIn-disable-options into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1158
2022-11-18 06:43:23 +00:00
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 c4430b4bca fix acl
gitea/salix/pipeline/head This commit looks good Details
2022-11-17 08:56:51 +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
Alex Moreno 9405333c07 try
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-16 15:29:02 +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
Pau 8059e54a26 Merge branch 'dev' into #288-traducir-state-i18n
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 12:54:47 +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 25764c0411 change error message
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 13:43:48 +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
Pau 3f446bda3d removed package-lock
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 12:28:42 +01:00
Pau 5b4c1ad4e6 Merge branch 'dev' into 3681-move-sign_save-to-salix
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 12:26:59 +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
Pau 7038d67d94 Removed comments
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 12:04:58 +01:00
Pau 3199797ee0 remove missplaced method
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 12:04:19 +01:00
Pau 6ab28678c5 Removed unused require and insert statement
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 11:56:03 +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