Commit Graph

285 Commits

Author SHA1 Message Date
Alex Moreno c7dd81e53d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev Build started... Details
2024-02-23 07:12:24 +01:00
Juan Ferrer 20e5eda4d1 fix: refs #6915 broken view vn.doc removed 2024-02-22 16:16:32 +01:00
Ivan Mas a0cb32ea10 refs #6784 Delete unnecessary JOINs
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-22 14:01:19 +01:00
Jorge Penadés 76b1433099 fix: refs #6878 use clockIn procedure on update time
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-22 12:48:07 +01:00
Guillermo Bonet 0344a81785 fix: refs #6780 Rollback vn2008.versiones
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-22 09:08:37 +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
David Domenech e4d60d20c5 Merge branch 'dev' into 6372-Delete-views-from-vn2008
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-22 05:59:00 +00:00
Pako Natek 10bdc21829 Merge branch 'dev' into 6906-workerActivity
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-21 16:16:41 +00:00
Alex Moreno 60dfe8ec05 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test_master24_8
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-21 15:12:48 +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
David Domenech 658c351860 Merge branch 'dev' into 6372-Delete-views-from-vn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-21 13:36:42 +00:00
David Domenech 29accbb23e Merge branch 'dev' into 6372-Delete-views-from-vn2008
gitea/salix/pipeline/pr-dev Build queued... Details
2024-02-21 13:10:20 +00:00
David Domenech 5bef3989cd refs #6372
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-21 14:07:52 +01:00
Ivan Mas 84270d29b8 refs #6626 modify invoiceInTax
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-21 13:15:46 +01:00
Ivan Mas f30a5a7597 refs #6626 invoiceInTax different transactions 2024-02-21 13:13:28 +01:00
Pako Natek 40a3df18e8 Merge branch 'dev' into 6906-workerActivity
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-21 11:14:35 +00:00
Pako Natek 3463b8fcb1 done
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-21 12:09:52 +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
David Domenech 1cf17a3d8d refs #6372
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-21 07:35:57 +01:00
Sergio De la torre 448763ee72 refs #6834 feat:handle Error
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-21 07:15:43 +01:00
Sergio De la torre 614652c357 refs #6834 feat:handle Error
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-21 07:08:45 +01:00
Sergio De la torre be81835474 refs #6834 feat:handle Error
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-20 16:11:59 +01:00
Sergio De la torre b9fe990003 refs #6834 feat:handle Error
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-20 16:10:16 +01:00
David Domenech 1fb0545817 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-20 13:21:38 +01:00
Ivan Mas 3813dbb9fd refs #6784 Delete clientTypeFk 2024-02-20 13:10:03 +01:00
Guillermo Bonet 6daa7a03ff Merge branch 'dev' into 5586-optimizeNegativeBases
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-20 06:26:16 +00: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 8642ddcd7f Merge branch 'dev' into 6392-balance-produccion-propia 2024-02-19 13:34:27 +01:00
Jorge Penadés d127354905 Merge branch 'dev' into 6776-makeMulti
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 12:21:48 +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
David Domenech 3d47c9e5e8 refs #6372
gitea/salix/pipeline/pr-dev Build queued... Details
2024-02-19 11:27:37 +01:00
Jorge Penadés 882c179e89 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6776-makeMulti 2024-02-19 11:14:02 +01:00
David Domenech 12f3af68bf refs #6372
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 11:04:07 +01:00
David Domenech cc600542ea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6372-Delete-views-from-vn2008 2024-02-19 10:58:36 +01:00
Pako Natek ad1010f3fc Merge branch 'dev' into 6358-boxPicking-BluePinguin
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 07:37:54 +00:00
Pako Natek 3ef26bfd7d packing
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 08:34:17 +01:00
Sergio De la torre f4ea220578 Merge branch 'dev' into 6559_getSectors
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-16 12:54:45 +00:00
Jorge Penadés 8cecff36ef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6776-makeMulti
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-16 13:14:59 +01:00
Jorge Penadés f8ceca3575 Merge branch 'dev' into 6760-modifyTransferClient
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-16 11:58:39 +00:00
Pako Natek f048412ad5 Merge branch 'dev' into 6358-boxPicking_ultimate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-16 11:13:10 +00:00
Pako Natek bf67c2348d refactor proc
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-16 12:05:47 +01:00
Jorge Penadés 556a67ecfc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6760-modifyTransferClient
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-16 08:26:32 +01:00
David Domenech ae0ce91127 refs #6685
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-16 06:10:09 +01:00
Jorge Penadés 3d25b599ed Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6776-makeMulti
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-15 14:49:21 +01:00
Jorge Penadés f11aa2605b feat: refs #6776 back & procedure modified
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-15 14:48:30 +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
Guillermo Bonet 3950f287c9 Merge branch 'dev' into 6721-método-de-pago-al-volver-a-activar-trabajadores
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-15 12:24:26 +00:00
Guillermo Bonet 4b568bc41e Merge branch 'dev' into 6775-itemProposalAdd
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-15 13:19:58 +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
Guillermo Bonet f63abc1a6e fix: refs #6859 zoneEstimatedDelivery
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-15 11:07:47 +01:00
Guillermo Bonet 256aa76e23 Merge branch 'dev' into 5586-optimizeNegativeBases
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-15 09:18:13 +00:00
Alex Moreno 625922275c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-15 10:14:19 +01:00
Alex Moreno 6685a20114 build: refs #6859 myt pull db
gitea/salix/pipeline/head This commit looks good Details
2024-02-15 10:04:15 +01:00
Jorge Penadés fa7b94590d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6760-modifyTransferClient
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-15 08:36:00 +01:00
Javi Gallego 6691155217 Merge branch 'dev' into 6392-balance-produccion-propia 2024-02-15 08:14:56 +01:00
Guillermo Bonet 46a1ad35b5 Merge branch 'dev' into 5586-optimizeNegativeBases
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-15 06:50:03 +00:00
Javier Segarra d9756a0f3f refs #2687 feat: comments 2024-02-15 07:49:57 +01:00
Jorge Penadés 32f8d13359 fix: refs #6760 back modified & revoke update on ticket.clientFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 13:15:31 +01:00
Guillermo Bonet 8ee8fe1851 Merge branch '6778-changeViewDependencesVn2008' of https://gitea.verdnatura.es/verdnatura/salix into 6778-changeViewDependencesVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 12:12:41 +01:00
Guillermo Bonet 35fc8930ce fix: refs #6778 Fix and tested 2024-02-14 12:12:40 +01:00
Guillermo Bonet 18c10e2dd7 refactor: refs #6778 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 11:39:15 +01:00
Guillermo Bonet 2c82a64029 Merge branch 'dev' into 6778-changeViewDependencesVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 10:38:33 +00:00
Guillermo Bonet b815677a1f Merge branch '6501-procMigration' of https://gitea.verdnatura.es/verdnatura/salix into 6501-procMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 11:16:53 +01:00
Guillermo Bonet b64637254b refactor: refs #6501 Requested changes 2024-02-14 11:16:52 +01:00
Guillermo Bonet 08db19bf4e Merge branch 'dev' into 6501-procMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 10:11:12 +00:00
Guillermo Bonet cddb8dc216 Merge branch 'dev' into 6501-procMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 10:06:23 +00:00
Guillermo Bonet 874f776498 refactor: refs #6501 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 11:05:16 +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
David Domenech fd785ee429 refs #6372
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-14 11:01:37 +01:00
Javier Segarra d1b24125f4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 2687_fix_travel_cloneWithEntries
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-14 09:33:34 +01:00
Javier Segarra fb1d11af17 refs #2687 feat: comments
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-02-14 09:32:44 +01:00
Javier Segarra b9a624d9cd refs #2687 feat: create util.procedures
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-02-14 09:30:31 +01:00
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
Juanjo Breso 8542f1fae5 feat: refs #6728 revision triggers test
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-14 08:34:02 +01:00
Juanjo Breso 6fe6e35607 Merge branch 'dev' into 6693-revisarTriggersPendientes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 07:10:08 +00:00
Juanjo Breso c2dadc09a2 feat: refs #6693 comprobar triggers
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-14 07:36:38 +01: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 142c1bf7bd Merge branch 'dev' into 5586-optimizeNegativeBases
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 06:03:46 +00:00
Ivan Mas add5fedc4e Merge branch 'dev' into 6830-item_getLackOrigin
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 13:12:02 +00:00
Juanjo Breso c9294680a5 Merge branch 'dev' into 6693-revisarTriggersPendientes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 12:53:13 +00:00
Pako Natek cf0d7e04a1 rounding stickers down 2024-02-13 13:43:31 +01:00
Josep Domingo 35df439f14 refs#6721 MetodoPagoActivarTrabajadores
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 13:19:26 +01:00
Guillermo Bonet 92261ebe0d fix: refs #5586 Tests fix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 13:09:12 +01:00
Guillermo Bonet 42de1a7e51 Merge branch 'dev' into 5586-optimizeNegativeBases
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-13 12:29:46 +01:00
Jorge Penadés 579f2abe5b fix: refs #6813 remove quotation marks
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 11:16:00 +01: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
Guillermo Bonet ed67b1168f refactor: refs #6501 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 11:14:35 +01:00
Jorge Penadés db2919b482 fix: refs #6813 procedure 2024-02-13 11:05:21 +01:00
Jorge Penadés d7fb31ee60 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6813-fixCreditClient
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 10:16:12 +01:00
Guillermo Bonet b1fa834626 refactor: refs #6775 Deleted proc itemProposal_Add
gitea/salix/pipeline/pr-dev Build queued... Details
2024-02-13 10:12:08 +01:00
Juanjo Breso 185cc4f17f feat: refs #6693 revisar triggers
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 09:50:07 +01:00
Jorge Penadés 6116ada156 fix: refs #6813 remove inserts
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 09:35:39 +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
Josep Domingo a897a05e8b feat: refs#6685RestoreViewCredit
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 07:52:09 +01:00
Guillermo Bonet c4528a9eac Merge branch 'dev' into 6501-procMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 06:16:13 +00:00
Guillermo Bonet fb84fe4b97 refactor: refs #6501 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 07:16:32 +01:00
Robert Ferrús 3c7fda87c8 Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1Fix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-12 12:59:24 +00:00
Ivan Mas 474c616b86 Merge branch 'dev' into 6446-Delete-function-nz-from-DB
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-12 12:54:21 +00:00