Commit Graph

214 Commits

Author SHA1 Message Date
jcasado f5943e4445 refs #6324 remove column and dependencies
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-04 13:57:23 +02:00
Jorge Penadés e851c3b481 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 14:15:31 +01:00
Alex Moreno 0b764ebc1b Merge pull request '#6514 - gestDocSupplier' (!2209) from 6514-gestDocSupplier into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2209
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-03-28 07:12:51 +00:00
Javier Segarra fe042e4d86 refs #5858 fix: test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 06:50:22 +01:00
Jorge Penadés 94f6d20bb1 feat: refs #6942 add Insert
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-26 13:41:53 +01:00
Jorge Penadés 634bfc5091 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008 2024-03-26 12:30:07 +01:00
Jon Elias 04e42cd3c8 feat: #6514 created supplierDms functionality
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-26 08:29:07 +01:00
Jon Elias c830c48ca9 Merge pull request 'style: #6556 set default user image, set users image' (!2168) from 6556-ChangeImages into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2168
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-03-26 06:35:10 +00:00
Jon Elias 415b829db0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6514-gestDocSupplier 2024-03-25 14:40:02 +01:00
Guillermo Bonet df115ec58b refactor: refs #6880 vn.professionalCategory changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-25 09:41:05 +01:00
Jon Elias 595b86b33e refs #6556 fixed hash changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-22 10:10:40 +01:00
Jon Elias c49b8bf954 refactor: refs #6556 minor changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-22 09:35:09 +01:00
Jon Elias eadd8f750d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6556-ChangeImages 2024-03-22 08:22:49 +01:00
Ivan Mas db71e69317 Merge branch 'dev' into 6827-check-usernames-special-characters
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-21 09:21:32 +00:00
Pablo Natek f7b458d368 feat: refs #6302 delete after add to turn
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-20 20:54:24 +01:00
Guillermo Bonet 8a96327d97 Merge branch 'dev' into 6232-refactorConfigTables
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-20 06:17:06 +00:00
Jon Elias 6d4f07adc3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6556-ChangeImages 2024-03-15 14:13:24 +01:00
Javier Segarra 0f4377ff5d refs #5858 test: fixtures
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-15 13:31:51 +01:00
Javier Segarra bfdbbc0fdf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions 2024-03-15 12:22:57 +01:00
Guillermo Bonet 336d5f0fba Merge branch 'dev' into 6232-refactorConfigTables
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-15 10:48:42 +00:00
Guillermo Bonet 158ed9b55c refs #6232 Regularized config tables
gitea/salix/pipeline/pr-dev Build queued... Details
2024-03-15 11:49:33 +01:00
Guillermo Bonet ea054eafd5 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-15 10:56:11 +01:00
Carlos Satorres 1c523d8d22 Merge branch 'dev' into 6842-sageMod
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-15 08:43:41 +00:00
Jon Elias 82001d8352 Merge branch 'dev' into 6556-ChangeImages
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-14 14:11:06 +00:00
Jon Elias d8a5bf8c84 style: #6556 set default user image, set users image
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-14 15:04:35 +01:00
Jorge Penadés 46b7acb52a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 11:54:35 +01:00
Carlos Andrés 3999533707 Merge branch 'test' into 6960-restricciones-AWB
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-14 11:33:14 +01:00
Carlos Andrés 1e29b6c1ed merge test
gitea/salix/pipeline/pr-master There was a failure building this commit Details
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-03-14 11:30:07 +01:00
Pablo Natek e3b7c7bb60 Merge branch 'dev' into 6005-backupLabeler
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 09:39:13 +00:00
Carlos Satorres dd7c700130 refs #6755 fix test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 09:53:50 +01:00
Alex Moreno 0ad052c34a refs #7033 deploy(2412): dev to test
gitea/salix/pipeline/pr-test This commit looks good Details
2024-03-14 08:36:19 +01:00
Carlos Satorres 1315bfda88 refs #6755 fix test
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-13 14:18:53 +01:00
Carlos Satorres f79d1320d8 Merge branch 'dev' into 6842-sageMod
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-13 10:29:07 +00:00
Jorge Penadés 10c2d25cbd feat: refs #6492 create procedures & grant privileges
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-12 12:57:34 +01:00
Carlos Satorres 106296be7b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6755-restoreRefactor
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-12 12:55:56 +01:00
Javier Segarra e7f6e61ea1 refs #5858: change notification owner
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-12 10:20:43 +01:00
Javier Segarra c1d0ea7e27 refs #5858: breaklines
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-12 09:40:42 +01:00
Javier Segarra 63a22a50f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions 2024-03-12 09:37:41 +01:00
Pablo Natek 8529bed895 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler 2024-03-11 12:01:13 +01:00
Carlos Satorres 35c5e127d4 Merge branch '6842-sageMod' of https://gitea.verdnatura.es/verdnatura/salix into 6842-sageMod
gitea/salix/pipeline/pr-dev Build queued... Details
2024-03-11 09:48:36 +01:00
Carlos Satorres b051b0512f refs #6842 fix fixtures 2024-03-11 09:48:29 +01:00
Jorge Penadés e5387b0b65 fix: refs #5186 use date function
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-11 09:14:05 +01:00
Javier Segarra 18773f34de Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-09 11:27:57 +01:00
Pablo Natek 2421cc7c68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-08 08:23:08 +01:00
Jorge Penadés 1e3967a4fe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-07 15:56:02 +01:00
Carlos Satorres 64d82d92d6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6755-restoreRefactor 2024-03-07 09:28:32 +01:00
Carlos Satorres a14ab90d5a refs #6755 fix restore add fixtures 2024-03-06 14:41:58 +01:00
Javier Segarra 7999a9bf93 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 11:42:09 +01:00
Jorge Penadés f600a99708 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2024-03-06 10:55:05 +01:00
Alex Moreno b761c258a1 refs #6336 feat(claimState): delete without using 2024-03-04 14:12:56 +01:00
Javier Segarra 753525d0ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-04 11:57:16 +01:00
Carlos Andrés b9e774cea0 feat: restricciones AWB para travel y entry refs #6960
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-01 14:26:36 +01:00
Jorge Penadés 7d8d31022b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-01 12:29:55 +01:00
Jorge Penadés 3caed386e9 feat: refs #5186 add fixtures
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-01 12:23:06 +01:00
Pablo Natek 6aa68afd8f Merge pull request 'remove(claimRma): refs #6349 remove' (!2100) from 6349-deleteClaimRma into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2100
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-03-01 07:39:06 +00:00
Javier Segarra becd2e6f48 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions 2024-02-29 07:49:24 +01:00
Carlos Satorres de9787642d Merge branch '5858-fiscalData-validations' of https://gitea.verdnatura.es/verdnatura/salix into 5858-fiscalData-validations
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-28 14:05:45 +01:00
Carlos Satorres c7f527133e refs #6053 fixture 2024-02-28 14:05:43 +01:00
Ivan Mas 10a89cb790 refs #6827 Check usernames special characters
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-28 13:32:17 +01:00
Jorge Penadés cbb7bd0028 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-27 15:50:47 +01:00
Jorge Penadés c875abf5e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-27 09:42:14 +01:00
Carlos Satorres c5e66f1862 Merge branch 'dev' into 5640-fixtures_clientSocialNameUPPER
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-27 08:31:43 +00:00
Pablo Natek afaa5fee7d fix(spec): refs #6349 fix fixtures
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 19:00:45 +01:00
Pablo Natek 8263b203a7 remove(claimRma): refs #6349 remove
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-26 18:38:50 +01:00
Alex Moreno d37802fda8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-26 07:21:47 +01:00
Alex Moreno 771545fa63 refs #5640 fix(fixutures): client social name
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 15:01:57 +01:00
Jorge Penadés 70c400c5f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 12:51:22 +01:00
Ivan Mas 03fc7cfb4e Merge branch 'dev' into 6784-delete-clientTypeFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 08:24:12 +00:00
Alex Moreno 489432b4e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 07:51:26 +01:00
Carlos Satorres fac7071bae refs #6414 fix(newWorker): back test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-22 14:38:26 +01:00
Javier Segarra cc90b13668 refs #5858 feat: remove unnecesary update
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-21 15:05:38 +01:00
Alex Moreno 01f1bd0088 Revert "Merge branch 'dev' into test"
gitea/salix/pipeline/pr-test This commit looks good Details
This reverts commit c4a64b93cc, reversing
changes made to 2ab1cebb31.
2024-02-21 14:44:34 +01:00
Pablo Natek 5e97f820a2 feat(spec): refs #6005 add spec
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-21 12:59:42 +01:00
Ivan Mas 65cb2d45fd refs #6784 Eliminate row in fixtures.before.sql
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-21 12:30:25 +01:00
Ivan Mas f0daf2dd9a refs #6784 Modify fixtures.before.sql
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-21 12:22:27 +01:00
Ivan Mas f592045925 refs #6784 Delete clientType.id and modify relationships in json and js 2024-02-21 11:49:27 +01:00
Alex Moreno 946006c7e6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-21 07:48:05 +01:00
Javier Segarra be0e835a37 refs #5878 feat: remove vn_event_getCollisions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-20 14:40:38 +01:00
Javier Segarra 811a49275d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions 2024-02-20 13:53:18 +01:00
Pablo Natek 1c40e01fcb refactor: refs #6005 move the logic to the report
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-20 13:49:42 +01:00
Ivan Mas 3813dbb9fd refs #6784 Delete clientTypeFk 2024-02-20 13:10:03 +01:00
Jorge Penadés 9b5823384a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2024-02-20 08:26:02 +01:00
Javi Gallego a7c48e9132 feat: #6392 quito de fixtures para que no falle la fk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 15:05:11 +01:00
Jorge Penadés 63c615655b 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-16 08:34:05 +01:00
Javier Segarra 24984e8aca Revert "refs #5858 feat: comments"
This reverts commit 05d685c86b.
2024-02-13 08:32:04 +01:00
Alex Moreno 06fe4957d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-13 08:13:58 +01:00
Javier Segarra 955828c63e refs #5858 feat: comments 2024-02-12 15:13:18 +01:00
Alex Moreno 5f60f2a00e refs #5509 feat(EntryDms): add fixtures 2024-02-12 15:04:49 +01:00
Javier Segarra 4799151565 refs #5858 feat: fixtures.before.sql 2024-02-12 10:12:17 +01:00
Javier Segarra a756c3bc3a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-12 08:51:58 +01:00
Jorge Penadés d1ea1aafff 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 13:12:48 +01:00
Guillermo Bonet cd613c770c Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-08 11:25:24 +00:00
Guillermo Bonet 2e009b6f25 refactor: refs #6609 sectorType description to code
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-08 12:04:34 +01:00
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
Alex Moreno e6735f9ea7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-07 08:35:54 +01:00
Guillermo Bonet f4feb6e8b7 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-06 12:13:48 +01:00
Alex Moreno 409bf9649f Merge branch 'dev' into 6757-supplierMayus
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 09:29:43 +00:00
Juanjo Breso 592e5c877f Merge branch 'dev' into 5167-kk-warehouseAlias-y-warehouseJoined
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-05 06:49:51 +00:00
Alex Moreno d5e6750998 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-02 09:36:41 +01:00
Jorge Penadés ec7a88c6dd fix: refs #6703 tests, backs & fixtures
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-01 12:56:11 +01:00
Guillermo Bonet 548526964e Merge branch 'dev' into 6184-saveCmr 2024-02-01 06:23:25 +00:00
Carlos Satorres aa993e7386 refs #6757 fix back, fix upperCase, fix e2e back
gitea/salix/pipeline/pr-dev Something is wrong with the build of this commit Details
2024-01-31 17:01:47 +01:00
Jorge Penadés 2c1b8bd9db 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-31 10:02:58 +01:00
Juanjo Breso 18772c04f6 feat: refs #5167 update
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-31 09:38:57 +01:00
Sergio De la torre f88cef6745 refs #6186 feat:deprecated packingShelve 2024-01-31 08:45:52 +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 34f7345315 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good Details
2024-01-30 08:44:04 +00:00
Guillermo Bonet 1e56e741e2 fix: #6184 Requested changes
gitea/salix/pipeline/head This commit looks good Details
2024-01-30 09:44:10 +01:00
Jorge Penadés a3442d4887 fix: refs #6276 fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-29 15:47:46 +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
Alex Moreno cf0e74c457 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-29 11:37:53 +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 1ad1e53970 feat: refs #5483 update db files
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-25 17:33:54 +01:00
Juan Ferrer b7edbbe12f feat: refs #5483 Copy vn-database project 2024-01-15 12:31:03 +01:00