Commit Graph

220 Commits

Author SHA1 Message Date
Robert Ferrús 4cfe4cf96d Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1Fix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 07:39:18 +00:00
Guillermo Bonet d83823ed0e Merge branch 'dev' into 6778-changeViewDependencesVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 07:07:00 +01:00
Guillermo Bonet 9dd5b725e1 Merge branch 'dev' into 6501-procMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 06:04:25 +00:00
Guillermo Bonet bf6d068830 Merge pull request 'refactor: refs #6781 Deleted timeControlDevice' (!2032) from 6781-timeControlDevice into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2032
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-02-13 10:16:43 +00:00
Guillermo Bonet 3c6e3a9856 Merge branch 'dev' into 6501-procMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 10:15:46 +00:00
Javi Gallego 51afb87122 feat: #6392 cambia gasto
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 09:54:26 +01:00
Guillermo Bonet 41db1c924f refactor: refs #6781 Deleted timeControlDevice
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 09:20:21 +01:00
Javier Segarra 37dd3c00c5 updates 2024-02-13 09:11:39 +01:00
Josep Domingo 3b35e4dae8 refs#6685 RestoreViewCredit
gitea/salix/pipeline/pr-dev Build queued... Details
2024-02-13 08:57:49 +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
Javi Gallego 118fbcb94f feat: #5720 vehicle nuevos campos
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 07:55:40 +01:00
Josep Domingo a897a05e8b feat: refs#6685RestoreViewCredit
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 07:52:09 +01:00
Alex Moreno 5f60f2a00e refs #5509 feat(EntryDms): add fixtures 2024-02-12 15:04:49 +01:00
Guillermo Bonet 00109e86af Merge branch 'dev' into 6778-changeViewDependencesVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-12 12:20:03 +00:00
Javier Segarra 05d685c86b refs #5858 feat: comments
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-12 13:17:47 +01:00
Javier Segarra e8c783ca68 refs #5858 feat: comments
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-12 13:14:41 +01:00
David Domenech 37a47edfdc refs #6372
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-12 12:25:58 +01:00
Javier Segarra 0a398fdd6c refs #5858 feat: comments
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-12 11:37:08 +01:00
David Domenech e1567dfb9e refs #6372
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-12 11:20:12 +01:00
Robert Ferrús ead206bd92 Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1Fix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-12 10:16:06 +00:00
Robert Ferrús 8a7441be57 feat: refs #6371
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-12 11:14:17 +01:00
Guillermo Bonet fc5daf119c Merge branch 'dev' into 6501-procMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-12 07:56:38 +00:00
Javi Gallego a18ddc8e9a Merge branch 'dev' into 6392-balance-produccion-propia
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-12 08:45:53 +01:00
Javi Gallego c818601552 feat: #6392 constraint solved 2024-02-12 08:45:47 +01:00
Javier Segarra 380e0ef651 refs #2687 fix: clone Travel as user action 2024-02-12 08:44:54 +01:00
David Domenech b712b65d76 refs #6372
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-12 07:44:40 +01:00
David Domenech 6044c160f8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6372-Delete-views-from-vn2008 2024-02-12 07:21:40 +01:00
Ivan Mas 362d825202 fix: refs #6443 #6444 #6445 ChangeRevokeToGrant
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-09 13:38:09 +01:00
Guillermo Bonet dbe63ad11b refactor: refs #6501 Fix grant errors
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-09 11:45:31 +01:00
Guillermo Bonet 2d6c56cd26 Merge branch '6501-procMigration' of https://gitea.verdnatura.es/verdnatura/salix into 6501-procMigration
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-09 11:41:24 +01:00
Guillermo Bonet 22e6f547fa refactor: refs #6501 Migrated procs from vn2008 to vn 2024-02-09 11:41:23 +01:00
Guillermo Bonet cc863a65f6 refactor: refs #6501 Migrated procs from vn2008 to vn 2024-02-09 11:40:20 +01:00
Guillermo Bonet 0cea80ad46 Merge branch 'dev' into 6501-procMigration
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-09 10:39:47 +00:00
Javi Gallego 463b3fb6f3 feat: #6392 solveConflicts
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-09 11:35:47 +01:00
Jorge Penadés 4f9c1b8c95 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6272-updateFiscalData
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-09 07:49:32 +01:00
Guillermo Bonet 18a27e032f Merge branch 'dev' into 6778-changeViewDependencesVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-08 13:55:00 +00:00
Robert Ferrús 53a367f4b3 feat: refs #6371 cleanTablesFix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-08 13:04:06 +01:00
Guillermo Bonet 6a94a48a9d refactor: refs #6609 sectorType description to code
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-08 12:18:37 +01:00
Guillermo Bonet a2bb3c476c Merge branch '6609-sectorType' of https://gitea.verdnatura.es/verdnatura/salix into 6609-sectorType
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-08 12:08:20 +01:00
Guillermo Bonet 3f400f92e5 refactor: refs #6609 sectorType description to code 2024-02-08 12:08:19 +01:00
Javi Gallego 3e8fbce34d feat: #6392 testeado
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-08 11:08:03 +01:00
Ivan Mas dee7019824 refs #6443 migrate vn2008.cc_to_iban to util.accountNumberToIban
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-08 10:50:56 +01:00
Jorge Penadés aff8ee28ea fix: refs #6272 back & create test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-07 10:16:47 +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
Javi Gallego 153e002cb8 Merge branch 'dev' into 6392-balance-produccion-propia 2024-02-06 15:54:06 +01:00
Javi Gallego 6a738627e7 feat: #6392 adaptado a los nuevos nombres 2024-02-06 15:42:03 +01:00
Guillermo Bonet c3174c0c38 Merge branch 'dev' into 6778-changeViewDependencesVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 13:02:30 +00: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
Carlos Satorres 318f74072e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6757-supplierMayus
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 10:09:11 +01:00
Juanjo Breso 6b5e1ecc01 Merge branch 'dev' into 5167-kk-warehouseAlias-y-warehouseJoined
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 09:07:43 +00:00
Juanjo Breso a949c25860 feat refs #5167 changes required
gitea/salix/pipeline/pr-dev Build queued... Details
2024-02-06 10:09:39 +01:00
Juanjo Breso 7ebb9cb429 feat: refs #5167 change required
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 09:55:47 +01:00
Ivan Mas c3912dd098 Merge branch 'dev' into refs-#6665-Clean-Views-vn2008-(1/9)
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 08:51:57 +00:00
Juanjo Breso c4eea81723 Merge branch 'dev' into 5167-kk-warehouseAlias-y-warehouseJoined
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 08:43:30 +00:00
Javi Gallego 19ab90a03c Merge branch 'dev' into 6392-balance-produccion-propia 2024-02-06 09:24:19 +01:00
Guillermo Bonet 8c13ebc5fc Merge branch 'dev' into 6778-changeViewDependencesVn2008
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-06 08:23:18 +00:00
Ivan Mas 5729ba90d1 Merge branch 'dev' into 6445-Remove-Vn2008.red-Function
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 08:04:50 +00:00
Juanjo Breso 9f6807204d feat: refs #5167 changes required
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 08:05:30 +01:00
Juanjo Breso b480df069d Merge branch 'dev' into 5167-kk-warehouseAlias-y-warehouseJoined
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 06:50:40 +00:00
David Domenech b7bb1b9784 refs #6372 feat: vn2008 to vn
gitea/salix/pipeline/pr-dev Build queued... Details
2024-02-06 07:37:33 +01:00
David Domenech 0aed49d603 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6372-Delete-views-from-vn2008 2024-02-06 07:29:42 +01:00
Javi Gallego 990ab82461 Merge branch 'dev' into 6392-balance-produccion-propia 2024-02-06 07:26:35 +01:00
Ivan Mas 6fb198f579 refs #6665 revoke permissions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-05 13:09:35 +01:00
Alex Moreno 691853df49 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-05 12:55:16 +01:00
Guillermo Bonet 80aaaf3fc5 Merge branch 'dev' into 6778-changeViewDependencesVn2008
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-05 08:02:04 +00:00
Guillermo Bonet d28cacfbad refactor: refs #6778 Migrated views of vn2008 to vn
gitea/salix/pipeline/pr-dev Build queued... Details
2024-02-05 09:02:31 +01:00
Jorge Penadés 17680b2cc7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-05 08:49:48 +01:00
Jorge Penadés 567359ad6a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-05 08:27:42 +01:00
Jorge Penadés 4164fd8250 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-05 08:22:42 +01: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
Josep Domingo e704f2eaf7 feat: refs #6689 Deleted view vn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-05 07:11:50 +01:00
Josep Domingo 4b0b4797ad Merge branch 'dev' into 6689-deleteViewsVn2008-6
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-05 06:00:02 +00:00
Juan Ferrer c3aeaf4da7 fix: refs #6371 Versions fixed
gitea/salix/pipeline/head This commit looks good Details
2024-02-02 23:07:29 +01:00
Jorge Penadés fde749de57 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-02 15:56:20 +01:00
Ivan Mas 0bd4602568 refs #6445 remove red function and modify precedures
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-02 15:50:16 +01:00
Josep Domingo 1ffbb30d77 refs #6689 feat: delete view vn2008
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-02 14:05:27 +01:00
Jorge Penadés 743f317b20 fix: refs #4466 test & sql
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-02 14:02:16 +01:00
Guillermo Bonet 42bf3db629 fix: refs #6371 Fixed version x2
gitea/salix/pipeline/head This commit looks good Details
2024-02-02 13:35:27 +01:00
Guillermo Bonet 2fca40b324 fix: refs #6371 Fixed version
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-02 13:32:25 +01:00
Robert Ferrús 6f5b03195b Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-02 12:08:09 +00:00
Guillermo Bonet 11b0d787e5 refactor: refs #6780 Revoke grants 2024-02-02 11:57:58 +01: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
Javi Gallego 6f4c0f655d feat: #6392 migrado de database 2024-02-02 08:05:17 +01:00
Robert Ferrús ff2328fd25 Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-01 11:56:10 +00:00
Alex Moreno 36e8840e6e Merge branch 'dev' into 6757-supplierMayus
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-01 09:28:59 +00:00
Guillermo Bonet 2ec7a43292 refactor: refs #6780 Changed dependences from vn2008 to vn 2024-02-01 09:49:44 +01:00
Jorge Penadés a2e076e94f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund
gitea/salix/pipeline/pr-dev Something is wrong with the build of this commit Details
2024-02-01 08:36:45 +01:00
Jorge Penadés 51e33887a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund 2024-02-01 08:32:53 +01:00
Guillermo Bonet 5d35519431 Merge branch 'dev' into 6692-viewClean9
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-01 07:29:55 +00:00
Robert Ferrús 805a7f65e7 Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1
gitea/salix/pipeline/pr-dev Something is wrong with the build of this commit Details
2024-02-01 07:20:07 +00:00
Jorge Penadés af4af43d9f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund 2024-02-01 08:14:50 +01:00
Guillermo Bonet 0b5395af2b Merge branch 'dev' into 6692-viewClean9
gitea/salix/pipeline/pr-dev Something is wrong with the build of this commit Details
2024-02-01 07:11:44 +00:00
Guillermo Bonet 386204926f Merge branch 'dev' into 6690-viewClean7
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-01 07:11:42 +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
David Domenech bad00167fa refs #6372 feat: vn2008 to vn 2024-01-31 14:50:56 +01:00
David Domenech a81a42c2e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6372-Delete-views-from-vn2008 2024-01-31 14:43:16 +01:00
Guillermo Bonet 6ebf5f135a refactor: refs #6235 Deleted views and dependences 2024-01-31 12:14:24 +01:00
Guillermo Bonet e0d15e572c Merge branch 'dev' into 6235-addDeviceWorkerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 10:13:57 +00:00
Robert Ferrús 57c5c510ff Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 10:05:46 +00:00
Guillermo Bonet 2677bf953d Merge branch 'dev' into 6690-viewClean7
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 09:39:49 +00:00
Guillermo Bonet a42e20bd5f refactor: refs #6690 Deleted views and dependences 2024-01-31 10:35:50 +01:00
Jorge Penadés 6f306ad18c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 09:59:57 +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
Jorge Penadés c136395d1e fix: refs #6703 fix conflicts 2024-01-31 09:16:38 +01:00
Jorge Penadés d43976192a fix: refs #6703 fix conflicts 2024-01-31 09:16:26 +01:00
Guillermo Bonet dd17b2c05d feat: refs #6235 Added device in clockIn 2024-01-31 09:04:30 +01:00
Sergio De la torre f88cef6745 refs #6186 feat:deprecated packingShelve 2024-01-31 08:45:52 +01:00
Robert Ferrús 22fa1d4c3f Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1
gitea/salix/pipeline/head Build queued... Details
2024-01-30 09:23:16 +01:00
Robert Ferrús 3a9eb100a1 feat: refs #6371 table vn2008 to vn
gitea/salix/pipeline/head This commit looks good Details
2024-01-30 08:06:36 +01:00
Guillermo Bonet 7a6d2ce984 Merge branch 'dev' into 6725-deletedFkLogs
gitea/salix/pipeline/head This commit looks good Details
2024-01-30 06:01:31 +00:00
Guillermo Bonet 8484afe2ea refactor: #6725 Deleted originFk from log tables
gitea/salix/pipeline/head This commit looks good Details
2024-01-29 14:29:10 +01:00
Javier Segarra 7880f41d1c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6174_refactor_invoicePdfNotify
gitea/salix/pipeline/pr-dev Build started... Details
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-29 14:11:08 +01:00
Javier Segarra 5396b402a5 refs #6174 feat: acl
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-29 14:10:30 +01:00
Robert Ferrús eb208edacc feat: refs #6371 pasar vn2008 a vn part1
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-29 12:35:49 +01:00
Guillermo Bonet 2268ef377f feat: #6625 Changed version to myt
gitea/salix/pipeline/head This commit looks good Details
2024-01-29 12:32:50 +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
David Domenech 8ea3c98a13 refs #6372 feat: vn2008 to vn
gitea/salix/pipeline/head This commit looks good Details
2024-01-29 09:12:29 +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