290 Commits

Author	SHA1	Message	Date
Guillermo Bonet	1f9f10323b	refactor: refs #6494 Migrated and deleted residual procs	2024-03-01 11:21:04 +01:00
Pablo Natek	6aa68afd8f	Merge pull request 'remove(claimRma): refs #6349 remove' (!2100) from 6349-deleteClaimRma into dev ... Reviewed-on: #2100 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-01 07:39:06 +00:00
Guillermo Bonet	f4aa5cea91	refactor: refs #6499 Grants	2024-03-01 07:32:45 +01:00
Jorge Penadés	7b0bed209e	feat: refs #5186 add acl & model	2024-02-29 16:27:42 +01:00
Jorge Penadés	1927878184	fix: refs #5186 drop SaleGroup from ticketLog	2024-02-29 16:04:16 +01:00
Jorge Penadés	c54c9ce913	fix: refs #5186 create parkingLog & add sector relation	2024-02-29 14:43:37 +01:00
Guillermo Bonet	625d19e88c	hotfix: Autoincrement warehouse	2024-02-29 13:44:58 +01:00
Guillermo Bonet	f5f2179ac6	refactor: refs #6495 Migrated procs to vn	2024-02-28 12:32:28 +01:00
Jorge Penadés	cbb7bd0028	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-27 15:50:47 +01:00
Guillermo Bonet	fefc193ec0	refactor: refs #6496 Deleted clean vn2008	2024-02-27 13:59:21 +01:00
Robert Ferrús	12fbae83c3	Merge branch 'dev' into 6738-cleanTables2008Part2to2	2024-02-27 12:55:55 +00:00
Robert Ferrús	2fe0d5f5dd	fix: refs #6371 restore tables dock y Tramos	2024-02-27 13:02:15 +01:00
Robert Ferrús	9c6c514056	feat: refs #6738	2024-02-27 11:48:49 +01:00
Jorge Penadés	2795c39442	Merge branch 'dev' into 6513-deleteWrongRecords	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 ... Reviewed-on: #2097 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-27 09:03:12 +00:00
Robert Ferrús	415b6109b9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6738-cleanTables2008Part2to2	2024-02-27 09:54:21 +01:00
Jorge Penadés	c875abf5e3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-27 09:42:14 +01:00
Jorge Penadés	5f20a66ad7	fix: refs #6513 use vn	2024-02-27 08:50:23 +01:00
Pablo Natek	8263b203a7	remove(claimRma): refs #6349 remove	2024-02-26 18:38:50 +01:00
Jorge Penadés	eba7ef31a2	fix: refs #6513 delete wrong records	2024-02-26 15:11:02 +01:00
Guillermo Bonet	554f6c4695	Merge branch 'test' into dev	2024-02-26 14:28:46 +01:00
Guillermo Bonet	57dd1a4e56	Merge branch 'master' into test	2024-02-26 14:28:08 +01:00
Carlos Andrés	2932e53389	feat:Agrupar DUA en función del transitario y país #6937	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	2024-02-26 12:29:44 +00:00
Jorge Penadés	41c44e6f59	Merge branch 'dev' into 6878-fixTimeEntry	2024-02-26 12:05:31 +00:00
Guillermo Bonet	89a9cc26d3	fix: ticket #158883	2024-02-26 09:50:03 +01:00
Jorge Penadés	910cc41beb	fix: refs #6513 trigger & alter table	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	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
Juan Ferrer	e6d789ea13	Merge pull request 'refs #6915 test into dev' (!2093) from test into dev ... 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 ... Reviewed-on: #2092	2024-02-23 18:02:07 +00:00
Jorge Penadés	3c038a060c	feat: refs #6513 WIP triggers & logger	2024-02-23 16:27:49 +01:00
Jorge Penadés	1a1e7742d3	feat: refs #6513 create table	2024-02-23 15:32:21 +01:00
Guillermo Bonet	34b5312266	Merge branch 'test' into dev	2024-02-23 15:04:59 +01:00
Guillermo Bonet	e971070f2f	fix: refs #6372 Version	2024-02-23 14:21:40 +01:00
David Domenech	d62c7ef0f5	refs #6372	2024-02-23 13:45:48 +01:00
David Domenech	8076707109	refs #6372	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	2024-02-23 12:51:22 +01:00
Jorge Penadés	6e161dfee8	fix: refs #6878 column name	2024-02-23 12:45:58 +01:00
Pablo Natek	18da27179d	merge(dev): refs #6005 traduction conflict	2024-02-23 09:40:58 +01:00
Ivan Mas	03fc7cfb4e	Merge branch 'dev' into 6784-delete-clientTypeFk	2024-02-23 08:24:12 +00:00
Alex Moreno	0ad3abcea3	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-23 08:39:54 +01:00
Alex Moreno	1d4c48e149	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-02-23 08:39:26 +01:00
Alex Moreno	4a2032b9cd	refs #5509 fix(EntryDms): sql	2024-02-23 07:39:56 +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	2024-02-23 07:13:05 +01:00
Alex Moreno	c7dd81e53d	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-02-23 07:12:24 +01:00
David Domenech	f2b1418419	Merge branch 'dev' into 6372-ExpenseManual-Error	2024-02-23 06:03:14 +00:00
Jorge Penadés	76b1433099	fix: refs #6878 use clockIn procedure on update time	2024-02-22 12:48:07 +01:00
Carlos Andrés	ae58c2219b	Merge branch 'dev' into test	2024-02-22 10:16:09 +00:00
David Domenech	13249fae08	refs #6372	2024-02-22 10:47:27 +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	2024-02-22 08:36:14 +01:00
David Domenech	d48fd77f48	refs #6372	2024-02-22 08:25:38 +01:00
David Domenech	5110d6e71d	fix error refs #6372	2024-02-22 07:09:35 +01:00
David Domenech	e4d60d20c5	Merge branch 'dev' into 6372-Delete-views-from-vn2008	2024-02-22 05:59:00 +00:00
Robert Ferrús	0a16335eaa	fix: refs #6371 restore tables	2024-02-21 18:48:39 +01:00
Pako Natek	10bdc21829	Merge branch 'dev' into 6906-workerActivity	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	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" ... 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" ... This reverts commit c4a64b93cc, reversing changes made to 2ab1cebb31.	2024-02-21 14:44:34 +01:00
Alex Moreno	c4a64b93cc	Merge branch 'dev' into test	2024-02-21 13:32:54 +00:00
David Domenech	5bef3989cd	refs #6372	2024-02-21 14:07:52 +01:00
Robert Ferrús	fba353f8e4	feat: refs #6371 restore Proveedores_cargueras	2024-02-21 13:43:33 +01:00
Pako Natek	3463b8fcb1	done	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	2024-02-21 07:35:57 +01:00
Pablo Natek	913e7aa1d8	fix(run): refs #6372 change version	2024-02-20 14:22:07 +01:00
Ivan Mas	3813dbb9fd	refs #6784 Delete clientTypeFk	2024-02-20 13:10:03 +01:00
Robert Ferrús	1563fe2cea	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6738-cleanTables2008Part2to2	2024-02-20 12:30:25 +01:00
Jorge Penadés	9ce162da71	fix: refs #6776 back	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
David Domenech	8f80b6ab7b	Merge branch 'dev' into 6372-Delete-views-from-vn2008	2024-02-20 06:05:34 +00:00
Robert Ferrús	4f6ae220e1	feat: refs #6738 crear las Fk de la tabla flight	2024-02-19 15:10:34 +01:00
Javi Gallego	a7c48e9132	feat: #6392 quito de fixtures para que no falle la fk	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	2024-02-19 14:46:56 +01:00
Jorge Penadés	d5a3413307	fix: refs #6776 method names & chanmges	2024-02-19 14:46:42 +01:00
Javi Gallego	c53ff1243f	feat: #6392 no es necesario agencyTermConfig	2024-02-19 14:37:36 +01:00
Javi Gallego	2c1172bd88	feat: #6392 sin gastos	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
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	2024-02-19 10:29:47 +00:00
David Domenech	3d47c9e5e8	refs #6372	2024-02-19 11:27:37 +01:00
Sergio De la torre	7a0320270a	Merge pull request 'test' (!2048) from test into dev ... Reviewed-on: #2048 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-19 10:25:33 +00:00
David Domenech	12f3af68bf	refs #6372	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
Sergio De la torre	5b541aa804	refs #6531 feat:modify name	2024-02-19 09:13:03 +01:00
Sergio De la torre	15de4f0b73	refs #6531 feat:showLastTickets	2024-02-16 15:56:40 +01:00
Pablo Natek	c10cb7c051	feat(spec): refs #6403 mrwIntegration	2024-02-16 14:15:13 +01:00
Jorge Penadés	030f42d03f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-16 13:11:02 +01:00
Jorge Penadés	63c615655b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-16 08:34:05 +01:00
Pablo Natek	85b1391006	fix(sql): refs #6403 merge master	2024-02-16 08:31:41 +01:00
Jorge Penadés	556a67ecfc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6760-modifyTransferClient	2024-02-16 08:26:32 +01:00
David Domenech	ae0ce91127	refs #6685	2024-02-16 06:10:09 +01:00
Javi Gallego	27627017c5	feat: #6392 fk que faltan	2024-02-15 14:21:49 +01:00
David Domenech	04fe6a8596	refs #6372	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	2024-02-15 13:48:21 +01:00