Commit Graph

468 Commits

Author SHA1 Message Date
Alex Moreno f51df43d17 Merge branch 'master' into 6878-hotfix-addManualTimeEntries
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-23 07:32:18 +00:00
Guillermo Bonet 6345d1ae42 fix refs #6780 XDiario
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test Build started... Details
2024-02-23 08:14:58 +01:00
Sergio De la torre 131ae6b522 refs #6193 feat:modify inventory
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 07:44:25 +01:00
Robert Ferrús 6580fd44cd fix: refs #6371 bankPolicy_notifyExpired accountingFk
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-23 07:18: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
Javier Segarra d0c82f694e 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-02-22 07:08:41 +01: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 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 7bf89cd448 Merge branch 'dev' into 5858-zone_Collisions
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-21 13:27:38 +00:00
Javier Segarra e00133458b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions 2024-02-21 13:48:53 +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
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
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
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
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
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
Pablo Natek 2e01b6ee0a refactor(packing): refs #6875 add restriction on vn.buy.packing field not null and > 0
gitea/salix/pipeline/pr-dev Build queued... Details
2024-02-19 09:55:54 +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
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 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
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
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
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
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 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 b64637254b refactor: refs #6501 Requested changes 2024-02-14 11:16:52 +01: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
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
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
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
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
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
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
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
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 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
Guillermo Bonet 96d6637a3f refactor: refs #6501 Minor change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-12 11:32:07 +01:00
Guillermo Bonet ee67a02bf0 refactor: refs #6501 Minor change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-12 11:28:54 +01:00
Guillermo Bonet fb76381624 refactor: refs #6501 Minor change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-12 11:02:24 +01:00
Guillermo Bonet 4b5802202d refactor: refs #6501 Minor change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-12 10:36:09 +01:00
Guillermo Bonet 23bf9b2750 refactor: refs #6501 Minor change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-12 10:28:25 +01:00
Javier Segarra 337190ef6d refs #5858 feat: use notification system 2024-02-12 10:27:46 +01:00
Guillermo Bonet f89ae0aad9 refactor: refs #6501 Minor change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-12 10:18:31 +01:00
Guillermo Bonet 212bf58932 refactor: refs #6501 Minor change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-12 10:08:56 +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
Ivan Mas b06f80e091 refs #6446 Delete function nz from db
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-12 08:11:49 +01:00
Guillermo Bonet cc863a65f6 refactor: refs #6501 Migrated procs from vn2008 to vn 2024-02-09 11:40:20 +01:00
Sergio De la torre dcefc9d382 refs #6651 feat:add urlImage
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-09 11:14:30 +01:00
Robert Ferrús 02bf78d00a feat: refs #6830 item_getLack origin
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-09 09:22:24 +01:00
Sergio De la torre 08728d3162 refs #6651 feat:add urlImage
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-09 07:51:51 +01:00
Sergio De la torre c2360ca154 refs #6559 feat:quit call get_sectors 2024-02-09 06:59:39 +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
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
Guillermo Bonet 974228eedd refactor: refs #5586 Optimized SQL negativeBases
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-08 11:37:15 +01:00
Robert Ferrús 747dabd154 feat: refs #6777
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-07 11:41:22 +01:00
Robert Ferrús 0fc1caeae6 Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 13:56:24 +00:00
Robert Ferrús 714cd3c2c3 feat: refs #6777
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 14:55:20 +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
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
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
Jorge Penadés fd4b246bd6 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-06 08:41:30 +01:00
Juanjo Breso 923d6a610a Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte2
gitea/salix/pipeline/pr-dev Something is wrong with the build of this commit Details
2024-02-06 07:20:18 +00:00
Guillermo Bonet f67b5fabe6 Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-06 08:18:39 +01:00
Guillermo Bonet 8ccaacbc07 fix: refs# 6642 Bug apply version
gitea/salix/pipeline/head This commit looks good Details
2024-02-06 08:15:25 +01: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
Robert Ferrús 01512c7d36 feat: refs #6777 change dependecies vn2008 to vn
gitea/salix/pipeline/pr-dev Build queued... Details
2024-02-05 13:52:28 +01: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
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
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
Jorge Penadés 2a6dc0c478 fix: refs #4466 spaces
gitea/salix/pipeline/pr-dev Build queued... Details
2024-02-02 15:56:05 +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
Javi Gallego 232f46be90 Merge branch 'dev' into 4515-addBuyCheck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-02 11:58:05 +00:00
Pablo Natek 1155c8d309 Merge branch 'dev' into 4515-addBuyCheck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-02 09:39:27 +00:00
Guillermo Bonet 35f047d4b9 Merge branch 'dev' into 6780-changeViewDependencesVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-02 09:04:59 +00:00
Sergio De la torre 92169adac7 Merge branch 'dev' into 5802_setState
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-01 16:17:25 +00:00
Javi Gallego 9a084d225c Merge branch 'dev' into 6567-cambiar-articulos
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-01 14:34:10 +00:00
Guillermo Bonet 2ec7a43292 refactor: refs #6780 Changed dependences from vn2008 to vn 2024-02-01 09:49:44 +01:00
Pablo Natek 650f85c737 Merge branch 'dev' into 4515-addBuyCheck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-01-31 13:57:44 +00:00
Pablo Natek 3182bfa46c refs #4515 2024-01-31 14:58:08 +01:00
Sergio De la torre 65a30224f5 Merge branch 'dev' into 5802_setState
gitea/salix/pipeline/pr-dev Something is wrong with the build of this commit Details
2024-01-31 11:33:09 +00: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
Juanjo Breso dc1ef34aba feat: refs #6493 refactorizar procedimientos vn2008 parte2
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-01-31 09:54:47 +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
Guillermo Bonet dd17b2c05d feat: refs #6235 Added device in clockIn 2024-01-31 09:04:30 +01:00
Juanjo Breso aba0d97106 feat: refs#5167 Update
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 09:00:43 +01:00
Sergio De la torre f88cef6745 refs #6186 feat:deprecated packingShelve 2024-01-31 08:45:52 +01:00
Sergio De la torre 4bf08ea147 refs #5890 feat:reserves
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 07:23:46 +01:00
Pablo Natek 7e7ab3e8b6 fix(triggers): refs #4515 fix error
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-30 15:07:13 +01:00
Sergio De la torre a46c3c4d95 refs #5802 feat:ticket_setState
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-30 13:31:17 +01:00
Sergio De la torre 27f6621447 refs #5802 feat:ticket_setState 2024-01-30 13:29:49 +01:00
Javi Gallego 4eb5efa2c9 feat: #6567 con varchar 2024-01-30 10:52:33 +01:00
Javi Gallego f0d4ae604b feat: #6567 sale_replaceItem adaptado a code 2024-01-30 10:03:21 +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