Commit Graph

1173 Commits

Author SHA1 Message Date
Jorge Penadés 2940c68516 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-08 08:36:05 +01:00
Pablo Natek d2d28889b6 merge(master): refs #6403 merge master fix conflicts
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-02-07 16:55:09 +01:00
Pablo Natek 6c9215bb51 feat(mrw): refs #6403 big commit 2024-02-07 16:52:43 +01:00
Alex Moreno 87864593b2 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-07 06:17:35 +00:00
Juan Ferrer a67a347a9e ci: refs#6706 CI fixes
gitea/salix/pipeline/head This commit looks good Details
2024-02-06 21:51:15 +01:00
Javier Segarra 4d6e631fca Merge branch 'dev' into 5834-billingDataAutoFillBic
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 17:33:27 +01:00
Guillermo Bonet 2cab007f57 fix: refs #6184 Requested changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-06 12:12:45 +01:00
Guillermo Bonet d6ae1fd1f8 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-06 06:39:51 +01:00
Juan Ferrer f2071d39ec ci: refs#6706 Jenkinsfile tuning & parallel back test (unstable, disabled)
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-04 23:58:26 +01:00
Javier Segarra 9448b40533 refs #6386 feat: add extension when return file
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-02 14:53:48 +01:00
Jorge Penadés 8f5a5d9cba fix: refs #6703 tests & backs 2024-01-31 13:11:15 +01:00
Javier Segarra b4bb9a4849 refs #5834 feat: new validation 2024-01-31 10:46:16 +01:00
Jorge Penadés 2a6abffef9 fix: refs #6276 fix errors & refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-30 16:07:33 +01:00
Javier Segarra 7ebdf59d97 Merge branch 'dev' into 5834-billingDataAutoFillBic
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-01-30 14:06:27 +00:00
Jorge Penadés e17fc91415 fix: refs #6276 fix acl, addSaleByCode & tests
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-30 14:58:11 +01:00
Jorge Penadés 88dfdb157f 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-30 11:25:17 +01:00
Guillermo Bonet ae7fb12b53 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-30 09:25:29 +00:00
Juan Ferrer c1726f9390 fix: refs #5483 Remove DB container when back tests end 2024-01-30 10:23:32 +01:00
Guillermo Bonet 13b8964e3d Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-30 07:27:34 +00:00
Sergio De la torre 0f3ffcfa61 fix: refs #6184 Upload sign
gitea/salix/pipeline/head This commit looks good Details
2024-01-30 08:11:33 +01:00
Juan Ferrer 7c18e22c38 feat: refs #5483 myt updated, back tests now use tmpfs for DB 2024-01-29 20:16:03 +01:00
Guillermo Bonet ed43b6be2d Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-29 14:38:14 +01:00
Juan Ferrer 194262a93e fix: refs #6085 ACL canEditAlias checked, migrated to remote hooks
gitea/salix/pipeline/head This commit looks good Details
2024-01-29 13:48:02 +01:00
Jorge Penadés 72e5050d93 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-29 08:37:55 +01:00
Juan Ferrer ce0684e6ff fix: refs #5483 myt updated, jenkins tests and fixtures fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-28 12:40:13 +01:00
Guillermo Bonet 49a08a96da Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good Details
2024-01-26 11:56:43 +00:00
Guillermo Bonet 5828fa9657 feat: #6184 Refactor saveSign
gitea/salix/pipeline/head This commit looks good Details
2024-01-26 10:05:24 +01:00
Juan Ferrer 81639726b2 feat: refs #5483 final merge
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-26 00:09:24 +01:00
Juan Ferrer a5cd4a671c Merge branch 'dev' into 5483-unifyDb 2024-01-25 17:31:19 +01:00
Pablo Natek 3848503853 fix(test): refs #6743 exportDb
gitea/salix/pipeline/head This commit looks good Details
2024-01-25 14:58:48 +01:00
Jorge Penadés 63fb3db8a1 fix: refs #6276 test item_card & general fixes
gitea/salix/pipeline/head This commit looks good Details
2024-01-25 12:14:14 +01:00
Jorge Penadés 01340408c6 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-25 08:14:02 +01:00
Jorge Penadés 02e38eb711 fix: refs #6276 fix tests
gitea/salix/pipeline/head Build queued... Details
2024-01-25 08:13:47 +01:00
Jorge Penadés e527780622 fix: refs #6276 drop suitcase sectorCollection_getSales
gitea/salix/pipeline/head This commit looks good Details
2024-01-24 11:24:49 +01:00
Jorge Penadés e849f0b6e2 fix: refs #6276 sectorCollection_getSales
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-24 11:20:08 +01:00
Pablo Natek 065dd0581d feat(spec): refs #6403 add test 2024-01-24 09:06:05 +01:00
Javier Segarra 40d5e8662b refs #6694 perf: remove unused imports
gitea/salix/pipeline/head This commit looks good Details
2024-01-24 08:38:34 +01:00
Javier Segarra 5b2b6a15ad refs #6694 perf: improve filter
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-24 08:36:08 +01:00
Jorge Penadés ae89d59bde feat: refs #6276 WIP test sectorCollection_getSales
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-23 15:58:09 +01:00
Javier Segarra 5d53d69754 refs #6694 perf: update postCode/filter method
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-23 12:52:35 +01:00
Jorge Penadés 08dd37e9e4 feat: refs #6276 test sectorCollection_getSales
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-23 12:13:23 +01:00
Guillermo Bonet 12bfb8ca77 feat: #6184 Added tests and process.env.IS_SPEC_RUNNING 2024-01-23 11:05:39 +01:00
Jorge Penadés 65e5c6dac5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2024-01-22 12:45:25 +01:00
Guillermo Bonet 6701f70a33 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-22 09:07:31 +00:00
Jorge Penadés b7ce6cac9c fix: refs #6276 machineWorker_update & tests
gitea/salix/pipeline/head This commit looks good Details
2024-01-19 12:38:58 +01:00
Jorge Penadés 5c0425b942 feat: refs #6276 test machineWorker_update
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-19 09:52:49 +01:00
Jorge Penadés 19edd7868e feat: refs #6276 test getVersion
gitea/salix/pipeline/head This commit looks good Details
2024-01-18 14:18:21 +01:00
Jorge Penadés d41d57143f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good Details
2024-01-18 13:53:26 +01:00
Jorge Penadés c8bfb35cf6 feat: refs #6276 test itemShelvingMake_multi
gitea/salix/pipeline/head This commit looks good Details
2024-01-18 13:28:22 +01:00
Jorge Penadés 6f35c62cd5 feat: refs #6276 test collection_addItem
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-18 11:51:21 +01:00
Pablo Natek 854447f7c1 feat: refs #6403 mrw cancelShipment
gitea/salix/pipeline/head This commit looks good Details
2024-01-18 07:36:21 +01:00
Javier Segarra 145e72022a refs #6694 perf: handle minor errors
gitea/salix/pipeline/head This commit looks good Details
2024-01-17 14:58:55 +01:00
Javier Segarra 38c93e8c76 refs #6694 test: add test 2024-01-17 14:49:35 +01:00
Guillermo Bonet 1a52e58eaa feat: #6184 Created generateCmrPdf
gitea/salix/pipeline/head This commit looks good Details
2024-01-17 14:18:31 +01:00
Javier Segarra d2db0661e2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6694_postcode_location_filter
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 14:16:50 +01:00
Javier Segarra 92a3e841ed refs #6694 perf: change let to const 2024-01-17 14:16:09 +01:00
Javier Segarra 71f387f626 refs #6694 feat: move filter remote method to own file 2024-01-17 14:15:21 +01:00
Jorge Penadés 6be2f07c22 fix: refs #6276 assignCollection
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 13:57:57 +01:00
Guillermo Bonet 45fd96cee6 feat: #6184 Modified uploadFile
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 13:07:26 +01:00
Guillermo Bonet 2f67056dbf Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-01-17 09:44:32 +01:00
Jorge Penadés 6a78123fca fix: refs #6276 machineWorke_update
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 09:01:48 +01:00
Javier Segarra 30b505aa8f refs #6694 feat: add filter for postcodes
gitea/salix/pipeline/head This commit looks good Details
2024-01-17 08:34:15 +01:00
Jorge Penadés 53a10dda58 feat: refs #6276 machineWorke_update
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 08:17:55 +01:00
Jorge Penadés 2fbea6f9dd feat: refs #6276 wip machineWorke_update
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-16 15:43:34 +01:00
Pablo Natek 7e3660aece feat(cancelShipment): refs #6403 mrwintegration 2024-01-16 15:04:06 +01:00
Guillermo Bonet 5bbeda4014 feat: refs #4734 Added viaexpress interdia
gitea/salix/pipeline/head This commit looks good Details
2024-01-16 13:05:16 +01:00
Pablo Natek 73c0ca5382 feat(mrwXml): refs #6403 render and transmEnvio integrated
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-15 15:00:36 +01:00
Jorge Penadés 54192c54ad 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-15 13:56:32 +01:00
Carlos Satorres 3cdf8b2011 Merge branch 'dev' into 6489-authSupport
gitea/salix/pipeline/head This commit looks good Details
2024-01-15 12:42:05 +00:00
Juan Ferrer 51a4608390 feat: refs #5483 Gulp and back tests adjustments
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-15 12:35:23 +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
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
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
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
Jorge Penadés 7a9f2bd79c refactor: refs #6276 align rows
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-09 11:23:54 +01:00
Jorge Penadés 9afc3840c7 fix: refs #6276 machineWorker_add
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-09 11:22:11 +01:00
Guillermo Bonet d5ca47ea2a refactor: refs #6410 Deleted dmsType.path
gitea/salix/pipeline/head This commit looks good Details
2024-01-09 09:51:12 +01:00
Alex Moreno 4e823593b5 refs #6067 fix(Mailer): await send email
gitea/salix/pipeline/head This commit looks good Details
2024-01-08 14:35:01 +01:00
Javier Segarra 8ee6cfb015 refs #5499 feat: send RocketMessage when change state
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-04 15:36:35 +01:00
Javier Segarra 71937a4df3 refs #5499 feat: send RocketMessage when change state
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-04 15:17:16 +01:00
Jorge Penadés 7a64b57a2a 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-04 15:07:33 +01:00
Jorge Penadés e354de4ff5 fix: updateInTime refs #6276
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-04 10:09:41 +01:00
Jorge Penadés 7d0c11e937 Merge branch '6276-createNewWarehouse' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-04 08:51:46 +01:00
Jorge Penadés 6d0e1cc47c refactor: fix conficts refs #6276 2024-01-04 08:51:18 +01:00
Javier Segarra 4d7f0329ee Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 12:46:26 +00:00
Sergio De la torre 0b5ffcc81c refs #6276:modify back silex→salix 2024-01-03 12:50:53 +01:00
Jorge Penadés b086da1936 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 08:57:46 +01:00
Carlos Satorres 12165ab382 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 08:31:07 +01:00
Javier Segarra 4510f0a037 Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 09:26:18 +00:00
Jorge Penadés 767894b128 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2024-01-02 09:41:47 +01:00
Jorge Penadés cd701ccd9e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 08:42:06 +01:00
Alex Moreno 0101dcda3a refs #5925 fix: add options
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 08:12:45 +01:00
Alex Moreno 318761185b refs #6434 fix: remove console.log
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 08:07:16 +01:00
Jorge Penadés 2e1715a968 refactor renewToken & replace ACL: refs #6274
gitea/salix/pipeline/head This commit looks good Details
2023-12-22 15:19:45 +01:00
Javier Segarra 4d2cf87f49 Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2023-12-22 09:37:53 +00:00
Javier Segarra 8d08adca21 Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2023-12-22 09:36:02 +00:00
Javier Segarra ec1befcfb0 Merge branch 'dev' into 6434-signIn_issue
gitea/salix/pipeline/head This commit looks good Details
2023-12-22 09:25:57 +00:00