Commit Graph

3868 Commits

Author SHA1 Message Date
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
Carlos Andrés 7ffc11e45a Merge pull request 'feat: comprobaciones facturas contabilizadas refs #6932' (!2091) from 6932-cambios-en-ENT-con-facturas-contabilzadas into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2091
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-02-26 16:22:26 +00:00
Carlos Andrés dcb09cd9f9 feat: comprobaciones facturas contabilizadas refs #6932
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 15:54:13 +01:00
Carlos Andrés 9cbcd70d4d feat: comprobaciones facturas contabilizadas refs #6932
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-26 15:44:34 +01:00
Carlos Andrés f1329a4624 feat: comprobaciones facturas contabilizadas refs #6932
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-26 15:43:17 +01:00
Jorge Penadés eba7ef31a2 fix: refs #6513 delete wrong records
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 15:11:02 +01:00
Guillermo Bonet 554f6c4695 Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 14:28:46 +01:00
Guillermo Bonet 57dd1a4e56 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-02-26 14:28:08 +01:00
Ivan Mas e3b735d80b 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-26 13:14:15 +00:00
Carlos Andrés 2932e53389 feat:Agrupar DUA en función del transitario y país #6937
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 14:00:27 +01:00
Carlos Andrés fa53dcbf9d feat:Agrupar DUA en función del transitario y país #6937 2024-02-26 13:57:56 +01:00
Carlos Andrés 27beefe1ef feat:Agrupar DUA en función del transitario y país #6937 2024-02-26 13:43:32 +01:00
Jorge Penadés 085e231142 Merge branch 'dev' into 6513-createSupplierDms
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 12:29:44 +00:00
Jorge Penadés 41c44e6f59 Merge branch 'dev' into 6878-fixTimeEntry
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 12:05:31 +00:00
Sergio De la torre 96abdd4630 refs #6078 feat:add workeractivity 2024-02-26 12:52:34 +01:00
Carlos Andrés bfd86c8972 feat: comprobaciones facturas contabilizadas refs #6932
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 12:18:57 +01:00
Carlos Andrés a19ce04a40 feat: comprobaciones facturas contabilizadas refs #6932
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 12:18:02 +01:00
Alex Moreno b1a8fcf968 refs #6925 fix(invoice): incoterms error 2024-02-26 11:50:46 +01:00
Guillermo Bonet 89a9cc26d3 fix: ticket #158883
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-26 09:50:03 +01:00
Jorge Penadés 910cc41beb fix: refs #6513 trigger & alter table
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 09:35:06 +01:00
Jorge Penadés 9df91a33b6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6513-createSupplierDms
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 08:26:17 +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
Carlos Andrés 4cc950011e feat: comprobaciones facturas contabilizadas refs #6932
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 18:15:07 +01:00
Carlos Andrés 55bc6418f5 feat: comprobaciones facturas contabilizadas refs #6932
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 18:13:01 +01:00
Carlos Andrés 5fe4f794cc feat: comprobaciones facturas contabilizadas refs #6932
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-23 18:10:23 +01:00
Carlos Andrés bed4faceb7 feat: comprobaciones facturas contabilizadas refs #6932
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-23 18:04:43 +01:00
Jorge Penadés 3c038a060c feat: refs #6513 WIP triggers & logger
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 16:27:49 +01:00
Carlos Andrés c18b42a717 feat: validar caracteres invocieIn.supplierref #6931
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 16:01:55 +01:00
Carlos Andrés 29a96ede56 feat: validar caracteres invocieIn.supplierref #6931
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-23 15:58:00 +01:00
Carlos Andrés b9a2cad1f1 feat: validar caracteres invocieIn.supplierref #6931 2024-02-23 15:46:30 +01:00
Carlos Andrés 6f599cbe4a Merge branch 'dev' into 6931-Líneas-en-referencias-de-invoiceIn.supplierRef 2024-02-23 15:45:37 +01:00
Carlos Andrés e0cee8f559 feat: validar caracteres invocieIn.supplierref #6931
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 15:41:30 +01:00
Jorge Penadés 1a1e7742d3 feat: refs #6513 create table
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 15:32:21 +01:00
Guillermo Bonet 34b5312266 Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-23 15:04:59 +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
Guillermo Bonet e971070f2f fix: refs #6372 Version
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-23 14:21:40 +01:00
David Domenech d62c7ef0f5 refs #6372
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-23 13:45:48 +01:00
David Domenech 8076707109 refs #6372
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-23 13:29:36 +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
Jorge Penadés 6e161dfee8 fix: refs #6878 column name
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 12:45:58 +01:00
Pablo Natek 18da27179d merge(dev): refs #6005 traduction conflict
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-23 09:40:58 +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 0ad3abcea3 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-23 08:39:54 +01:00
Alex Moreno 1d4c48e149 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-23 08:39:26 +01:00
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 08b109140d Merge branch 'dev' into 6193_inventory
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 07:02:53 +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
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
Alex Moreno 607b908814 Merge branch 'dev' into 6414-fix_backTest_newWorker
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 06:41:36 +00:00
Alex Moreno 4a2032b9cd refs #5509 fix(EntryDms): sql
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 07:39:56 +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
Alex Moreno 1f48245223 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-23 07:13:54 +01:00
Alex Moreno 2b19004783 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-23 07:13:05 +01:00
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
David Domenech f2b1418419 Merge branch 'dev' into 6372-ExpenseManual-Error
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 06:03:14 +00:00
Juan Ferrer 20e5eda4d1 fix: refs #6915 broken view vn.doc removed 2024-02-22 16:16:32 +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
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
Carlos Andrés ae58c2219b Merge branch 'dev' into test
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-22 10:16:09 +00:00
David Domenech 13249fae08 refs #6372 2024-02-22 10:47:27 +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
Pablo Natek f4f6eeb6fe fix(version): refs #6372 add semicolon
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-22 08:36:14 +01:00
David Domenech d48fd77f48 refs #6372
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-22 08:25:38 +01:00
David Domenech 5110d6e71d fix error refs #6372
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-22 07:09:35 +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
Robert Ferrús 0a16335eaa fix: refs #6371 restore tables
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-21 18:48:39 +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 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 92f2282632 Revert "Merge pull request 'Revert "Merge branch 'dev' into test"' (!2064) from test_revert into test"
gitea/salix/pipeline/pr-dev This commit looks good Details
This reverts commit cbe23d8df5, reversing
changes made to c4a64b93cc.
2024-02-21 14:52:28 +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
Alex Moreno c4a64b93cc Merge branch 'dev' into test
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-02-21 13:32:54 +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
Robert Ferrús fba353f8e4 feat: refs #6371 restore Proveedores_cargueras
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-21 13:43:33 +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
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
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
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
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
Pablo Natek 913e7aa1d8 fix(run): refs #6372 change version
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-20 14:22:07 +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
Jorge Penadés 9ce162da71 fix: refs #6776 back
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-20 10:59:13 +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
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 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 e9f7fbed86 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-19 14:46:56 +01:00
Jorge Penadés d5a3413307 fix: refs #6776 method names & chanmges
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 14:46:42 +01:00
Javi Gallego c53ff1243f feat: #6392 no es necesario agencyTermConfig
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 14:37:36 +01:00
Javi Gallego 2c1172bd88 feat: #6392 sin gastos
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-19 13:56:16 +01: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
Pako Natek f0d59f12e6 Merge branch 'dev' into 6358-boxPicking-BluePinguin
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 10:55:11 +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 c12fdc2ed4 Merge branch 'dev' into 6372-Delete-views-from-vn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 10:29:47 +00:00
David Domenech 3d47c9e5e8 refs #6372
gitea/salix/pipeline/pr-dev Build queued... Details
2024-02-19 11:27:37 +01:00
Sergio De la torre 7a0320270a Merge pull request 'test' (!2048) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2048
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-02-19 10:25:33 +00:00
Jorge Penadés 8d1dea8a00 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-19 11:19:59 +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
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
Sergio De la torre 5b541aa804 refs #6531 feat:modify name
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-19 09:13:03 +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 15de4f0b73 refs #6531 feat:showLastTickets
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-16 15:56:40 +01:00
Pablo Natek c10cb7c051 feat(spec): refs #6403 mrwIntegration
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-02-16 14:15:13 +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 030f42d03f 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-16 13:11:02 +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 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
Pablo Natek 85b1391006 fix(sql): refs #6403 merge master
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-02-16 08:31:41 +01:00
Pablo Natek 94fe0220e5 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6403-mrwIntegration 2024-02-16 08:30:06 +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
Javi Gallego 27627017c5 feat: #6392 fk que faltan
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-15 14:21:49 +01:00
David Domenech 04fe6a8596 refs #6372
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-15 13:58:12 +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 38cfb6e03e build: refs #6859 Merge from test
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-15 11:47:33 +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
Javier Segarra 234ea26fe2 Merge branch 'test' into 2687_fix_travel_cloneWithEntries
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-15 07:07:44 +00:00
Alex Moreno fddbf6451b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-02-15 07:52:08 +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
Javi Gallego 798bd10303 Merge pull request 'feat: refs #5720 vehicle nuevos campos' (!2029) from 5720-poolbancario into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2029
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-02-14 14:02:21 +00:00
Javi Gallego d7efdacab3 Merge branch 'dev' into 5720-poolbancario
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 13:47:13 +00:00
Robert Ferrús 88f508a424 fix: refs #6371 balanceNestTree add constraint
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 14:42:04 +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 b46087b75c refactor: refs #6501 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 11:21:22 +01: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
Javi Gallego 3665db359e feat: #63922 actualiza usando las fk
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-14 09:02:39 +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 76b4f8f46f 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 11:46:47 +01: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
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 d3755d6aa2 Merge branch 'dev' into 6775-itemProposalAdd
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 09:11:55 +00: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
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
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