Commit Graph

1519 Commits

Author SHA1 Message Date
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
Robert Ferrús 9795f449b9 Merge branch 'dev' into 6738-cleanTables2008Part2to2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-21 12:23:06 +00: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
Javier Segarra 1089dfcbb0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6427_sms_resetPassword
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-20 13:51:00 +01:00
Javier Segarra bfc8cda8a2 refs #6427 feat restorePassWordSMS 2024-03-20 13:49:49 +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
Javier Segarra 633f6c41e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6427_sms_resetPassword 2024-03-18 12:12:56 +01: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
Robert Ferrús 0f57931b3a Merge branch 'dev' into 6738-cleanTables2008Part2to2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 10:43:14 +00: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
Robert Ferrús 0413707061 feat: refs #6738
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-13 12:50:27 +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
Javier Segarra 5fcf928649 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6427_sms_resetPassword
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-07 10:45:04 +01:00
Alex Moreno ed39ede6cc Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-07 10:35:14 +01:00
Alex Moreno f29212cb65 deploy: refs #6995 production dump
gitea/salix/pipeline/head This commit looks good Details
2024-03-07 10:34:24 +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
Javier Segarra 2f0c8d96d2 refs 5858 fix: resolve breaklines 2024-03-06 11:41:25 +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 8e976d2e4f refs #5858 feat: remove Schedule system
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-29 09:28:27 +01: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 24d925ac8c Merge branch 'dev' into 5640-fixtures_clientSocialNameUPPER
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 06:03:42 +00:00
Juan Ferrer e6d789ea13 Merge pull request 'refs #6915 test into dev' (!2093) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2093
2024-02-23 18:05:45 +00:00
Juan Ferrer 3f0d301870 Merge pull request 'refs #6915 master into test' (!2092) from master into test
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2092
2024-02-23 18:02:07 +00:00
Juan Ferrer 13aca51f2d build: refs #6915 dump & rocket shows Jenkins URL
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test Build queued... Details
2024-02-23 18:57:32 +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
Alex Moreno 033b176e72 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-22 09:06:03 +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
Javier Segarra 88a88640e5 refs #5858 feat: sql comments 2024-02-21 14:22:06 +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
David Domenech 8f80b6ab7b Merge branch 'dev' into 6372-Delete-views-from-vn2008
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-20 06:05:34 +00: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
Javier Segarra c06af7ac9a Merge branch 'dev' into 6427_sms_resetPassword
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 13:43:09 +00:00
Alex Moreno e8a945ba51 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-19 11:49:20 +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
David Domenech 03b5ed064d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6372-Delete-views-from-vn2008
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-15 13:48:21 +01:00
Juan Ferrer a9ccbfc1d4 Merge branch 'test' into dev 2024-02-15 11:41:01 +01:00
Juan Ferrer cc24ecdc7d build(dump): refs #6859
gitea/salix/pipeline/head This commit looks good Details
2024-02-15 11:28:46 +01:00
David Domenech 0c7ca79ae0 Merge branch 'dev' into 6372-Delete-views-from-vn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 10:03:49 +00:00