Commit Graph

3740 Commits

Author SHA1 Message Date
Guillermo Bonet b9c5930f68 refactor: refs #6499 Minor changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-28 08:29:12 +01:00
Guillermo Bonet 6c67462943 refactor: refs #6499 Minor changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-28 08:26:17 +01:00
Guillermo Bonet 80ecd698f8 refactor: refs #6499 Migrated procs to vn
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-28 08:23:58 +01:00
Guillermo Bonet fefc193ec0 refactor: refs #6496 Deleted clean vn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-27 13:59:21 +01:00
Robert Ferrús 2fe0d5f5dd fix: refs #6371 restore tables dock y Tramos
gitea/salix/pipeline/pr-master Build queued... Details
2024-02-27 13:02:15 +01:00
Jorge Penadés 2795c39442 Merge branch 'dev' into 6513-deleteWrongRecords
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-27 09:07:20 +00:00
Carlos Andrés 7795c949b1 Merge pull request '6937-Agrupar-los-DUA-en-funcion-del-transitario-y-pais' (!2097) from 6937-Agrupar-los-DUA-en-funcion-del-transitario-y-pais into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2097
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-02-27 09:03:12 +00: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
Jorge Penadés 5f20a66ad7 fix: refs #6513 use vn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-27 08:50:23 +01: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
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
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
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 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
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
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
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
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
Javier Segarra 838effadc0 refs #5858 feat: move change to vnx
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-21 15:18:10 +01: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
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 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
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 88a88640e5 refs #5858 feat: sql comments 2024-02-21 14:22:06 +01: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
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
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