981 Commits

Author	SHA1	Message	Date
Robert Ferrús	3420667ae5	Merge branch 'dev' into 7150-greuge_dif_porte_add	2024-04-10 06:05:03 +00:00
Jorge Penadés	a3c1bceb7e	refactor: refs #6492 use enum	2024-04-09 15:57:34 +02:00
Pablo Natek	ed517399dc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler	2024-04-09 15:04:04 +02:00
Ivan Mas	f02c4354ba	Merge branch 'dev' into 6827-check-usernames-special-characters	2024-04-09 14:45:29 +02:00
Ivan Mas	521033edd2	Merge branch 'dev' into 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal	2024-04-09 11:54:41 +00:00
Pablo Natek	da037c5235	refactor: refs #6005 delay on productionConfig	2024-04-09 13:34:33 +02:00
Jorge Penadés	9a28a59d00	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008	2024-04-09 11:11:30 +02:00
Guillermo Bonet	f8be6be7a3	feat: refs #6636 Minor change	2024-04-09 10:10:11 +02:00
Guillermo Bonet	c42e00f11e	Merge branch 'dev' into 6636-pickup	2024-04-09 07:43:51 +00:00
Pablo Natek	7cb40f5d89	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler	2024-04-09 09:42:39 +02:00
Robert Ferrús	1743f7501a	Merge branch 'dev' into 6500-procRefactor8	2024-04-09 05:37:18 +00:00
Robert Ferrús	2c0c346a7b	feat: refs #6500	2024-04-09 07:34:43 +02:00
Sergio De la torre	590bcd9088	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-04-09 06:58:53 +02:00
Robert Ferrús	6ba43a3c6d	Merge branch 'dev' into 7150-greuge_dif_porte_add	2024-04-08 11:29:09 +00:00
Juanjo Breso	351d5b5ba3	Merge branch '6493-refactorizar-procedimientos-vn2008-parte_2' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-08 12:57:03 +02:00
Juanjo Breso	d3df3e3376	feat: refs#6493 Cambios solicitados procedimientos	2024-04-08 12:57:01 +02:00
Juanjo Breso	eab1bfe6ab	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-08 10:43:39 +00:00
Robert Ferrús	d595a7b2fa	feat: refs #6500	2024-04-08 12:22:15 +02:00
Juanjo Breso	92cd61460e	feat: refs#6493 Cambios solicitados procedimientos	2024-04-08 09:56:36 +02:00
Sergio De la torre	09812c24dd	refs #5890 feat: triggers	2024-04-08 09:54:23 +02:00
Robert Ferrús	1e8e6a67a3	Merge branch 'dev' into 7150-greuge_dif_porte_add	2024-04-08 06:39:22 +00:00
Guillermo Bonet	e27279e20e	Merge branch 'dev' into 6636-pickup	2024-04-08 05:18:36 +00:00
Sergio De la torre	2770919db9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-04-08 07:09:47 +02:00
Juanjo Breso	f06bbef0eb	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-08 05:08:53 +00:00
Alex Moreno	93000aaecf	Merge branch 'dev' into 6549-ticket_close	2024-04-05 12:20:09 +00:00
Carlos Satorres	e0c0c4dbc0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6111-routeList	2024-04-05 13:30:14 +02:00
Carlos Andrés	cedfdbb421	fix: closeTicket idem salix Refs: #6549	2024-04-05 13:22:54 +02:00
Juanjo Breso	f316ca6974	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-05 10:55:20 +00:00
Robert Ferrús	cf5113c5a6	Merge branch 'dev' into 6738-cleanTables2008Part2to2	2024-04-05 10:23:55 +00:00
Guillermo Bonet	6c1e44638e	feat: refs #6636 Added getEnumValue method	2024-04-05 11:01:00 +02:00
Javier Casado	6f2b3ea059	Merge pull request 'refs #6324 remove column and dependencies' (!2255) from 6324-removePackageFk into dev ... Reviewed-on: #2255 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-05 07:55:46 +00:00
Guillermo Bonet	ac658fb6af	Merge branch 'dev' into 6636-pickup	2024-04-05 05:29:26 +00:00
Carlos Andrés	fe0afe30bf	fix: closeTicket idem salix Refs: #6549	2024-04-04 17:50:39 +02:00
Sergio De la torre	2ed5237568	Merge branch 'dev' into 6964_itemOlder	2024-04-04 13:45:20 +00:00
Guillermo Bonet	fcb4fe92e8	Merge branch 'dev' into 6636-pickup	2024-04-04 12:14:23 +00:00
Guillermo Bonet	f44e19cae3	feat: refs #6636 Modified updateClaim, model and tests	2024-04-04 14:15:20 +02:00
jcasado	f5943e4445	refs #6324 remove column and dependencies	2024-04-04 13:57:23 +02:00
Carlos Satorres	02bee2e07c	refs #6111 routeList sql	2024-04-04 12:45:43 +02:00
Sergio De la torre	b742f8a13c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-04-04 12:26:01 +02:00
Guillermo Bonet	29eee4e8a7	Merge branch 'test' into dev	2024-04-04 11:30:03 +02:00
Sergio De la torre	c066462c10	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-04-04 07:09:16 +02:00
Alex Moreno	ff2e00c51c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-04-03 16:24:45 +02:00
Guillermo Bonet	064d6dbb64	feat: refs #6829 Added two indexes	2024-04-03 11:57:28 +02:00
Robert Ferrús	448b8e6ea3	Merge branch 'dev' into 6738-cleanTables2008Part2to2	2024-04-03 07:50:06 +00:00
Juanjo Breso	4767b98442	Merge branch '6493--refactorizar-procedimientos-vn2008-parte2' into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-02 10:59:25 +02:00
Pako Natek	7c4fc31b50	version productionConfig	2024-04-01 08:55:21 +02:00
Jorge Penadés	e851c3b481	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008	2024-03-28 14:15:31 +01:00
Jorge Penadés	e83d8b1464	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6724-permisos-vn.entry.isBooked	2024-03-28 13:35:33 +01:00
Sergio De la torre	b62905c5ef	Merge branch 'dev' into 6964_itemOlder	2024-03-28 10:08:56 +00:00
Carlos Satorres	9f438751d3	Merge branch 'dev' into 6074-KkearisBlocked	2024-03-28 08:13:37 +00:00
Javi Gallego	699883182c	Merge pull request '7120-specialPrice' (!2213) from 7120-specialPrice into dev ... Reviewed-on: #2213 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-03-28 08:01:45 +00:00
Alex Moreno	0b764ebc1b	Merge pull request '#6514 - gestDocSupplier' (!2209) from 6514-gestDocSupplier into dev ... Reviewed-on: #2209 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-28 07:12:51 +00:00
Sergio De la torre	9698c049fc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-03-28 07:35:37 +01:00
Carlos Satorres	f4915fbe2e	Merge branch 'dev' into 6074-KkearisBlocked	2024-03-27 16:50:03 +00:00
Robert Ferrús	ed1bc06301	feat: refs #7150	2024-03-27 17:30:52 +01:00
Robert Ferrús	9667d31441	feat: refs #7150	2024-03-27 17:00:27 +01:00
Carlos Satorres	97b2500eea	refs #6074 fix comment	2024-03-27 14:24:58 +01:00
Javi Gallego	2881409b1e	feat: #7120 con fecha por defecto	2024-03-27 07:19:51 +01:00
Sergio De la torre	43b042a616	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder	2024-03-27 07:08:47 +01:00
Javier Segarra	a2a16d227c	refs #5858 fix rename file	2024-03-26 12:41:30 +00:00
Jorge Penadés	634bfc5091	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008	2024-03-26 12:30:07 +01:00
Javi Gallego	9408b82874	feat: #7120 con esquema	2024-03-26 12:18:53 +01:00
Javi Gallego	c99de95b33	feat: #7120 con tabla temporal	2024-03-26 12:07:23 +01:00
Sergio De la torre	c265896224	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder	2024-03-26 10:24:27 +01:00
Jon Elias	0f4e1acf09	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6514-gestDocSupplier	2024-03-26 08:37:51 +01:00
Jon Elias	04e42cd3c8	feat: #6514 created supplierDms functionality	2024-03-26 08:29:07 +01:00
Alex Moreno	dce0155c00	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-26 08:18:47 +01:00
Juanjo Breso	9a628869cd	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte2	2024-03-26 06:45:27 +00:00
Sergio De la torre	1840117b3b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder	2024-03-25 16:08:11 +01:00
Guillermo Bonet	df115ec58b	refactor: refs #6880 vn.professionalCategory changes	2024-03-25 09:41:05 +01:00
Jorge Penadés	e8d1967e11	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll	2024-03-22 15:14:12 +01:00
Sergio De la torre	61b649fdc5	refs #6964 feat:advice for olderItem	2024-03-22 11:47:12 +01:00
Pablo Natek	531bd9ef80	Merge branch 'dev' into 6021-floranet	2024-03-22 10:17:49 +00:00
Juanjo Breso	84f544dd2b	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte2	2024-03-22 06:49:21 +00:00
Carlos Satorres	ca0d269ee2	refs #6074 remove isBlocked	2024-03-21 15:02:09 +01:00
Robert Ferrús	9795f449b9	Merge branch 'dev' into 6738-cleanTables2008Part2to2	2024-03-21 12:23:06 +00:00
Ivan Mas	c33c90aefe	Merge branch 'dev' into 6499-procRefactor6	2024-03-21 10:39:05 +00:00
Sergio De la torre	d7d47da3e2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-03-21 11:19:16 +01:00
Ivan Mas	db71e69317	Merge branch 'dev' into 6827-check-usernames-special-characters	2024-03-21 09:21:32 +00:00
Sergio De la torre	9eee26cbe9	refs #6276 feat:newWarehouse	2024-03-21 10:18:54 +01:00
Alex Moreno	b087c35a36	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-21 08:01:05 +01:00
Alex Moreno	adddcc96aa	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-03-20 15:01:17 +01:00
Robert Ferrús	bb86c27202	feat: refs #7116 create table agencyIncoming	2024-03-20 11:07:55 +01:00
Guillermo Bonet	cdaa7999d1	Merge branch 'dev' into 6395-buyBuyerFk	2024-03-20 07:55:05 +00:00
Guillermo Bonet	397b49db91	fix: refs #6232 Comment conveyorConfig lines	2024-03-20 08:02:11 +01:00
Guillermo Bonet	b327120932	fix: refs #6232 Comment queueConfig lines	2024-03-20 07:39:38 +01:00
Guillermo Bonet	8a96327d97	Merge branch 'dev' into 6232-refactorConfigTables	2024-03-20 06:17:06 +00:00
Carlos Andrés	1315a854a9	fix: closeTicket idem salix Refs: #6549	2024-03-18 18:15:05 +01:00
Carlos Andrés	913b261f86	Merge branch 'dev' into 6549-ticket_close	2024-03-18 17:55:54 +01:00
Pako Natek	8f54a7f12d	deliveryDate	2024-03-18 14:03:16 +01:00
Alex Moreno	4f90fb06d8	hotFix(debug) varchar to text	2024-03-18 13:25:23 +01:00
Jorge Penadés	07326e502b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll	2024-03-18 08:23:47 +01:00
Jorge Penadés	f044809f30	feat: refs #6951 to create back	2024-03-15 15:45:47 +01:00
Guillermo Bonet	3aa81d27e7	refs #6875 Packing default 1	2024-03-15 14:53:31 +01:00
Carlos Andrés	bafd4456ef	feat: conversion art. A1 a A2 refs #4979	2024-03-15 14:46:43 +01:00
Javier Segarra	bfdbbc0fdf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-15 12:22:57 +01:00
Guillermo Bonet	336d5f0fba	Merge branch 'dev' into 6232-refactorConfigTables	2024-03-15 10:48:42 +00:00
Guillermo Bonet	158ed9b55c	refs #6232 Regularized config tables	2024-03-15 11:49:33 +01:00
Carlos Satorres	1c523d8d22	Merge branch 'dev' into 6842-sageMod	2024-03-15 08:43:41 +00:00
Javier Segarra	6989299593	Merge branch 'dev' into 6930_scopedToken_Multimedia	2024-03-15 08:26:45 +00:00
Jorge Penadés	4c6def5a52	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6724-permisos-vn.entry.isBooked	2024-03-14 16:26:24 +01:00
Robert Ferrús	0f57931b3a	Merge branch 'dev' into 6738-cleanTables2008Part2to2	2024-03-14 10:43:14 +00:00
Pablo Natek	e3b7c7bb60	Merge branch 'dev' into 6005-backupLabeler	2024-03-14 09:39:13 +00:00
Guillermo Bonet	166b74c70d	Merge branch 'dev' into 6395-buyBuyerFk	2024-03-14 08:59:22 +00:00
Sergio De la torre	06b33fc59d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-03-14 09:50:07 +01:00
Guillermo Bonet	ad7b7be661	refs #6875 Fix version	2024-03-14 09:15:19 +01:00
Jorge Penadés	7a94ae3551	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008	2024-03-14 09:10:44 +01:00
Guillermo Bonet	08359cdfe0	Merge pull request 'refactor: refs #6875 Add restriction on vn.buy.packing field not null and > 0' (!2047) from 6875-packingNotNull into dev ... Reviewed-on: #2047 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-14 08:05:11 +00:00
Alex Moreno	0ad052c34a	refs #7033 deploy(2412): dev to test	2024-03-14 08:36:19 +01:00
Carlos Satorres	7895f12e3d	Merge branch 'dev' into 6842-sageMod	2024-03-14 07:28:12 +00:00
Carlos Satorres	2d8f5f5f50	Merge branch '6842-sageMod' of https://gitea.verdnatura.es/verdnatura/salix into 6842-sageMod	2024-03-14 08:26:52 +01:00
Carlos Satorres	e24eed16c1	refs #6842 fix companyCode	2024-03-14 08:26:50 +01:00
Sergio De la torre	bfcfd2245b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-03-14 07:40:30 +01:00
Robert Ferrús	2d7110f05c	Merge branch 'dev' into 6738-cleanTables2008Part2to2	2024-03-14 06:08:00 +00:00
Carlos Andrés	77d1a38a87	fix: closeTicket idem salix refs #6549	2024-03-13 18:51:11 +01:00
Javier Segarra	4012b1756d	refs #5858 add comment	2024-03-13 15:00:12 +01:00
Robert Ferrús	6163cad8a5	refs #6738	2024-03-13 14:17:10 +01:00
Robert Ferrús	fad30eb56d	feat: refs #6738	2024-03-13 14:08:14 +01:00
Guillermo Bonet	11dcb6e79f	refactor: refs #6875 packing not null, negative or zero	2024-03-13 13:45:57 +01:00
Robert Ferrús	052acdcc08	feat: refs #7029 packaging	2024-03-13 13:20:14 +01:00
Robert Ferrús	2d9a106fab	feat: refs #6738 premisos	2024-03-13 12:59:45 +01:00
Robert Ferrús	0413707061	feat: refs #6738	2024-03-13 12:50:27 +01:00
Carlos Andrés	ff459ea3be	fix: closeTicket idem salix refs #6549	2024-03-13 12:18:43 +01:00
Javier Segarra	172e7566b5	refs #5858 perf: improve insert	2024-03-13 11:58:25 +01:00
Guillermo Bonet	cbaa48a933	Merge branch 'dev' into 6875-packingNotNull	2024-03-13 10:56:17 +00:00
Javier Segarra	8276765225	refs #5858 perf: destinationFk to pepe	2024-03-13 11:54:02 +01:00
Carlos Satorres	f79d1320d8	Merge branch 'dev' into 6842-sageMod	2024-03-13 10:29:07 +00:00
Alex Moreno	bce82881f3	Merge branch 'dev' into 6005-backupLabeler	2024-03-13 07:03:56 +00:00
Robert Ferrús	a6de9fd370	feat: refs #6738 modificar a nombres propuestos	2024-03-13 07:19:06 +01:00
Jorge Penadés	9e596e6525	fix: refs #6492 file names	2024-03-12 15:27:09 +01:00
Javier Segarra	ff6a1a9111	refs #6930 perf: remove logoutMultimedia acl	2024-03-12 13:39:01 +01:00
Jorge Penadés	10c2d25cbd	feat: refs #6492 create procedures & grant privileges	2024-03-12 12:57:34 +01:00
Javier Segarra	486b51bcfa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6930_scopedToken_Multimedia	2024-03-12 12:46:46 +01:00
Robert Ferrús	9624cdce60	Merge branch 'dev' into 6738-cleanTables2008Part2to2	2024-03-12 11:25:56 +00:00
Sergio De la torre	9d94259d67	refs #6078 feat: workerActivity	2024-03-12 12:21:46 +01:00
Javier Segarra	e7f6e61ea1	refs #5858: change notification owner	2024-03-12 10:20:43 +01:00
Sergio De la torre	375b690063	Merge branch 'dev' into 6078_workerActivty	2024-03-12 09:12:45 +00:00
Javier Segarra	63a22a50f4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-12 09:37:41 +01:00
Guillermo Bonet	819bc7a56d	Merge pull request 'refactor: refs #6495 Migrated procs to vn' (!2108) from 6495-procRefactor4 into dev ... Reviewed-on: #2108 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-03-12 06:04:19 +00:00
Guillermo Bonet	516b4b364f	Merge branch 'dev' into 6499-procRefactor6	2024-03-11 13:36:34 +00:00
Pablo Natek	8529bed895	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler	2024-03-11 12:01:13 +01:00
Sergio De la torre	61de81254a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-03-11 08:11:00 +01:00
Javier Segarra	18773f34de	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-09 11:27:57 +01:00
Javier Segarra	4994a836c7	refs #5858 feat: alter table util.notification	2024-03-09 11:27:29 +01:00
Guillermo Bonet	1027ef6479	Merge branch 'dev' into 6495-procRefactor4	2024-03-08 11:31:54 +00:00
Jorge Penadés	76c5595a58	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog	2024-03-08 11:01:25 +01:00
Pablo Natek	2421cc7c68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler	2024-03-08 08:23:08 +01:00
Alex Moreno	89c55d23a4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-08 08:11:30 +01:00
David Domenech	60c50337ff	refs #6372	2024-03-08 07:43:13 +01:00
David Domenech	014914e1d9	refs #6372	2024-03-08 07:36:14 +01:00
Carlos Andrés	45bcf8043f	feat: permissions to vn.entry.isBooked refs#6724	2024-03-07 19:03:57 +01:00
Jorge Penadés	1e3967a4fe	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog	2024-03-07 15:56:02 +01:00
Carlos Satorres	557f1ec2d9	Merge branch 'dev' into 6842-sageMod	2024-03-07 13:40:37 +00:00
Alex Moreno	ed39ede6cc	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-07 10:35:14 +01:00
Alex Moreno	fbdebad12c	fix: refs #6995 desdeprecar unary_scan, unary_scan_line, unary_scan_line_buy, unary_scan_line_expedition	2024-03-07 10:29:31 +01:00
Alex Moreno	00355aba3a	fix: refs #6995 desdeprecar unary y unary_scan	2024-03-07 10:24:18 +01:00
Alex Moreno	b8f09f363f	fix: refs #6995 restore vn2008.jerarquia	2024-03-07 09:33:32 +01:00
Alex Moreno	a8c2779ee7	Merge branch 'master' into 6995-testToMaster_2410	2024-03-07 06:22:04 +00:00
Sergio De la torre	69ad44c0bd	Merge branch 'dev' into 6078_workerActivty	2024-03-07 07:18:16 +01:00
Guillermo Bonet	39b4e5db28	Merge branch 'dev' into 6948-bank	2024-03-07 06:17:26 +00:00
Guillermo Bonet	ee08502f33	Merge branch 'dev' into 6495-procRefactor4	2024-03-07 06:07:54 +00:00
Guillermo Bonet	cd40bd47e5	refactor: refs #6495 Deleted procs	2024-03-07 07:08:40 +01:00
Javier Segarra	6c06f70121	Merge branch 'dev' into 6930_scopedToken_Multimedia	2024-03-06 18:18:34 +00:00
Carlos Andrés	f1654609df	Merge pull request 'test' (!2142) from test into dev ... Reviewed-on: #2142 Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>	2024-03-06 16:16:16 +00:00
Carlos Andrés	fc3c9332b3	Merge pull request 'master' (!2141) from master into test ... Reviewed-on: #2141 Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-03-06 16:10:42 +00:00
Carlos Andrés	c81749da78	feat: add column department.pbxQueue refs #6387	2024-03-06 16:38:34 +01:00
Carlos Satorres	58a239708d	refs #6842 remove sage	2024-03-06 13:11:41 +01:00
Carlos Satorres	59a0cb3f4a	refs #6842 deprecated and move	2024-03-06 13:08:20 +01:00
Javier Segarra	7999a9bf93	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-06 11:42:09 +01:00
Javier Segarra	eb5fdd1940	refs 5858 feat: replace with code	2024-03-06 11:41:48 +01:00
Guillermo Bonet	094c00aabd	Merge branch 'dev' into 6495-procRefactor4	2024-03-06 10:17:45 +00:00
Jorge Penadés	f600a99708	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-03-06 10:55:05 +01:00
Alex Moreno	31dc2db838	Merge branch 'dev' into 6336-claimState_removeSome	2024-03-06 08:08:25 +00:00
Ivan Mas	354ecfaa16	refs #6498 Arreglar grant y tabs	2024-03-06 09:00:21 +01:00
Robert Ferrús	b353924034	Merge branch 'dev' into 6738-cleanTables2008Part2to2	2024-03-05 13:49:57 +00:00
Ivan Mas	f215ce5f05	refs #6498 Delete procedures vn2008 and grant vn procs	2024-03-05 14:33:16 +01:00
Robert Ferrús	5f16a9827c	feat: refs #6738 move file version	2024-03-05 14:17:58 +01:00
Robert Ferrús	1580914567	Merge branch 'dev' into 6738-cleanTables2008Part2to2	2024-03-05 12:23:23 +00:00
Pako Natek	9c14836bc7	BlueMonkey	2024-03-05 13:18:13 +01:00
Guillermo Bonet	00d5d06c6a	Merge branch 'test' into dev	2024-03-05 12:38:15 +01:00
Guillermo Bonet	85d3508848	Merge branch 'master' into test	2024-03-05 12:37:06 +01:00
Sergio De la torre	cf181521d6	refs #6078 feat:add workeractivity	2024-03-05 11:53:57 +01:00
Guillermo Bonet	55ba315858	refactor: refs #6948 Bank to Accouting	2024-03-05 10:30:25 +01:00
Guillermo Bonet	e0732835d0	refactor: refs #6948 Bank to Accouting	2024-03-05 10:25:23 +01:00
Jorge Penadés	0aa4add71b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-03-05 10:11:41 +01:00
Robert Ferrús	d668ae9904	refs #6738	2024-03-05 09:34:30 +01:00
Robert Ferrús	dc343a7e3b	feat: refs #6738 delete vn2008.dock	2024-03-05 09:33:48 +01:00
Guillermo Bonet	ab4d1a0437	Merge branch 'dev' into 6495-procRefactor4	2024-03-05 07:54:40 +00:00
Guillermo Bonet	619ac4e053	refactor: refs #6495 Requested changes	2024-03-05 08:55:40 +01:00
Robert Ferrús	0c9e11c0b2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6738-cleanTables2008Part2to2	2024-03-05 08:40:34 +01:00
Robert Ferrús	9a0b4ef674	feat: refs #6738 change table vn2008 to vn	2024-03-05 08:36:19 +01:00
Guillermo Bonet	489d126f79	Merge branch 'dev' into 6494-procRefactor3	2024-03-04 13:44:47 +00:00
Alex Moreno	5e794a7791	Merge branch 'dev' into 6336-claimState_removeSome	2024-03-04 13:15:50 +00:00
Alex Moreno	b761c258a1	refs #6336 feat(claimState): delete without using	2024-03-04 14:12:56 +01:00
Guillermo Bonet	2c7913a3be	Merge branch 'dev' into 6499-procRefactor7	2024-03-04 12:41:50 +00:00
Guillermo Bonet	fa70eeb75c	refactor: refs #6499 Requested changes	2024-03-04 13:42:11 +01:00
Guillermo Bonet	e65fc06a30	Merge branch 'dev' into 6494-procRefactor3	2024-03-04 12:33:49 +00:00
Javier Segarra	753525d0ac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-04 11:57:16 +01:00
Javier Segarra	78c92af02f	refs #5858 feat: fix vn file	2024-03-04 11:57:10 +01:00
Jorge Penadés	9cff06ae3d	feat: refs #6276 acl itemBarcode delete	2024-03-04 09:30:07 +01:00
Sergio De la torre	d48a54e95b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-03-04 07:25:45 +01:00
Guillermo Bonet	df7427d83c	Merge branch 'dev' into 6499-procRefactor7	2024-03-04 06:07:56 +00:00
Guillermo Bonet	b29a001c7f	Merge branch 'dev' into 6496-cleanVn2008	2024-03-04 06:07:53 +00:00
Guillermo Bonet	216f6f1db3	Merge branch 'dev' into 6495-procRefactor4	2024-03-04 06:07:30 +00:00
Jorge Penadés	7d8d31022b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-03-01 12:29:55 +01:00
Jorge Penadés	657430d28b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog	2024-03-01 12:15:49 +01:00
Guillermo Bonet	941e7da767	Merge branch 'dev' into 6494-procRefactor3	2024-03-01 10:23:08 +00:00
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
Javier Segarra	95fa776e41	refs 5858 feat: sql files	2024-02-29 12:49:50 +00:00
Guillermo Bonet	625d19e88c	hotfix: Autoincrement warehouse	2024-02-29 13:44:58 +01:00
Juanjo Breso	ecd7e8eb98	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte2	2024-02-29 11:59:13 +01:00
Javier Segarra	8e976d2e4f	refs #5858 feat: remove Schedule system	2024-02-29 09:28:27 +01:00
Javier Segarra	becd2e6f48	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-02-29 07:49:24 +01:00
Ivan Mas	10a89cb790	refs #6827 Check usernames special characters	2024-02-28 13:32:17 +01:00
Guillermo Bonet	f5f2179ac6	refactor: refs #6495 Migrated procs to vn	2024-02-28 12:32:28 +01:00
Javier Segarra	1d1d950e4b	refs 6930 feat: ACL	2024-02-28 11:57:00 +01:00
Javier Segarra	9cad2de9fb	Merge branch '6930_scopedToken_Multimedia' of https://gitea.verdnatura.es/verdnatura/salix into 6930_scopedToken_Multimedia	2024-02-28 10:55:39 +01:00
Javier Segarra	a06a593412	refs 6930 feat: ACL	2024-02-28 10:55:36 +01:00
Sergio De la torre	fd077ae60f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-02-28 07:45:39 +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
Sergio De la torre	96abdd4630	refs #6078 feat:add workeractivity	2024-02-26 12:52:34 +01: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
Javier Segarra	d0c82f694e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-02-22 07:08:41 +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
Javier Segarra	838effadc0	refs #5858 feat: move change to vnx	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	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
Ivan Mas	48310d24c7	refs #6732 change name supplier.isSerious to supplier.isReal	2024-02-21 14:36:12 +01:00
Alex Moreno	c4a64b93cc	Merge branch 'dev' into test	2024-02-21 13:32:54 +00:00
Javier Segarra	88a88640e5	refs #5858 feat: sql comments	2024-02-21 14:22:06 +01: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
Pablo Natek	5e97f820a2	feat(spec): refs #6005 add spec	2024-02-21 12:59:42 +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
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
Pablo Natek	1c40e01fcb	refactor: refs #6005 move the logic to the report	2024-02-20 13:49:42 +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
Carlos Satorres	9e3b4e8451	refs #6842 sql mod sage	2024-02-19 13:30:03 +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
Pablo Natek	2e01b6ee0a	refactor(packing): refs #6875 add restriction on vn.buy.packing field not null and > 0	2024-02-19 09:55:54 +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
Sergio De la torre	0ad8306dd9	refs#5890 feat: delete trigger and modify getTickets	2024-02-16 07:00:08 +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
Pako Natek	55d15dbca2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6021-floranet	2024-02-15 13:50:15 +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
Pako Natek	0eaeb2e805	nueva rama	2024-02-15 13:13:22 +01:00
Juan Ferrer	38cfb6e03e	build: refs #6859 Merge from test	2024-02-15 11:47:33 +01:00
Alex Moreno	625922275c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-15 10:14:19 +01:00
Jorge Penadés	fa7b94590d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6760-modifyTransferClient	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
Javi Gallego	798bd10303	Merge pull request 'feat: refs #5720 vehicle nuevos campos' (!2029) from 5720-poolbancario into dev ... 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	2024-02-14 13:47:13 +00:00
Robert Ferrús	88f508a424	fix: refs #6371 balanceNestTree add constraint	2024-02-14 14:42:04 +01:00
Jorge Penadés	32f8d13359	fix: refs #6760 back modified & revoke update on ticket.clientFk	2024-02-14 13:15:31 +01:00
Guillermo Bonet	2c82a64029	Merge branch 'dev' into 6778-changeViewDependencesVn2008	2024-02-14 10:38:33 +00:00
Guillermo Bonet	b46087b75c	refactor: refs #6501 Requested changes	2024-02-14 11:21:22 +01:00
Guillermo Bonet	08db19bf4e	Merge branch 'dev' into 6501-procMigration	2024-02-14 10:11:12 +00:00
David Domenech	0c7ca79ae0	Merge branch 'dev' into 6372-Delete-views-from-vn2008	2024-02-14 10:03:49 +00:00
David Domenech	fd785ee429	refs #6372	2024-02-14 11:01:37 +01:00
Javi Gallego	3665db359e	feat: #63922 actualiza usando las fk	2024-02-14 09:02:39 +01:00
Robert Ferrús	4cfe4cf96d	Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1Fix	2024-02-14 07:39:18 +00:00
Guillermo Bonet	d83823ed0e	Merge branch 'dev' into 6778-changeViewDependencesVn2008	2024-02-14 07:07:00 +01:00
Guillermo Bonet	9dd5b725e1	Merge branch 'dev' into 6501-procMigration	2024-02-14 06:04:25 +00:00
Guillermo Bonet	bf6d068830	Merge pull request 'refactor: refs #6781 Deleted timeControlDevice' (!2032) from 6781-timeControlDevice into dev ... Reviewed-on: #2032 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-13 10:16:43 +00:00
Guillermo Bonet	3c6e3a9856	Merge branch 'dev' into 6501-procMigration	2024-02-13 10:15:46 +00:00
Javi Gallego	51afb87122	feat: #6392 cambia gasto	2024-02-13 09:54:26 +01:00
Guillermo Bonet	41db1c924f	refactor: refs #6781 Deleted timeControlDevice	2024-02-13 09:20:21 +01:00
Javier Segarra	37dd3c00c5	updates	2024-02-13 09:11:39 +01:00
Josep Domingo	3b35e4dae8	refs#6685 RestoreViewCredit	2024-02-13 08:57:49 +01:00
Javier Segarra	24984e8aca	Revert "refs #5858 feat: comments" ... This reverts commit 05d685c86b.	2024-02-13 08:32:04 +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
Javi Gallego	118fbcb94f	feat: #5720 vehicle nuevos campos	2024-02-13 07:55:40 +01:00
Josep Domingo	a897a05e8b	feat: refs#6685RestoreViewCredit	2024-02-13 07:52:09 +01:00
Alex Moreno	5f60f2a00e	refs #5509 feat(EntryDms): add fixtures	2024-02-12 15:04:49 +01:00
Guillermo Bonet	00109e86af	Merge branch 'dev' into 6778-changeViewDependencesVn2008	2024-02-12 12:20:03 +00:00
Javier Segarra	05d685c86b	refs #5858 feat: comments	2024-02-12 13:17:47 +01:00
Javier Segarra	e8c783ca68	refs #5858 feat: comments	2024-02-12 13:14:41 +01:00
David Domenech	37a47edfdc	refs #6372	2024-02-12 12:25:58 +01:00
Javier Segarra	0a398fdd6c	refs #5858 feat: comments	2024-02-12 11:37:08 +01:00
David Domenech	e1567dfb9e	refs #6372	2024-02-12 11:20:12 +01:00
Robert Ferrús	ead206bd92	Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1Fix	2024-02-12 10:16:06 +00:00
Robert Ferrús	8a7441be57	feat: refs #6371	2024-02-12 11:14:17 +01:00
Guillermo Bonet	fc5daf119c	Merge branch 'dev' into 6501-procMigration	2024-02-12 07:56:38 +00:00
Javi Gallego	a18ddc8e9a	Merge branch 'dev' into 6392-balance-produccion-propia	2024-02-12 08:45:53 +01:00
Javi Gallego	c818601552	feat: #6392 constraint solved	2024-02-12 08:45:47 +01:00
Javier Segarra	380e0ef651	refs #2687 fix: clone Travel as user action	2024-02-12 08:44:54 +01:00
David Domenech	b712b65d76	refs #6372	2024-02-12 07:44:40 +01:00
David Domenech	6044c160f8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6372-Delete-views-from-vn2008	2024-02-12 07:21:40 +01:00
Guillermo Bonet	c8b156771d	feat: refs #6395 Added buyerFk in buy	2024-02-09 14:00:16 +01:00
Ivan Mas	362d825202	fix: refs #6443 #6444 #6445 ChangeRevokeToGrant	2024-02-09 13:38:09 +01:00
Jorge Penadés	4aeb88229d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-09 13:07:42 +01:00
Guillermo Bonet	dbe63ad11b	refactor: refs #6501 Fix grant errors	2024-02-09 11:45:31 +01:00
Guillermo Bonet	2d6c56cd26	Merge branch '6501-procMigration' of https://gitea.verdnatura.es/verdnatura/salix into 6501-procMigration	2024-02-09 11:41:24 +01:00
Guillermo Bonet	22e6f547fa	refactor: refs #6501 Migrated procs from vn2008 to vn	2024-02-09 11:41:23 +01:00
Guillermo Bonet	cc863a65f6	refactor: refs #6501 Migrated procs from vn2008 to vn	2024-02-09 11:40:20 +01:00
Guillermo Bonet	0cea80ad46	Merge branch 'dev' into 6501-procMigration	2024-02-09 10:39:47 +00:00
Javi Gallego	463b3fb6f3	feat: #6392 solveConflicts	2024-02-09 11:35:47 +01:00
Jorge Penadés	4f9c1b8c95	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6272-updateFiscalData	2024-02-09 07:49:32 +01:00
Guillermo Bonet	18a27e032f	Merge branch 'dev' into 6778-changeViewDependencesVn2008	2024-02-08 13:55:00 +00:00
Jorge Penadés	d1ea1aafff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-08 13:12:48 +01:00
Robert Ferrús	53a367f4b3	feat: refs #6371 cleanTablesFix	2024-02-08 13:04:06 +01:00
Guillermo Bonet	6a94a48a9d	refactor: refs #6609 sectorType description to code	2024-02-08 12:18:37 +01:00
Guillermo Bonet	a2bb3c476c	Merge branch '6609-sectorType' of https://gitea.verdnatura.es/verdnatura/salix into 6609-sectorType	2024-02-08 12:08:20 +01:00
Guillermo Bonet	3f400f92e5	refactor: refs #6609 sectorType description to code	2024-02-08 12:08:19 +01:00
Javi Gallego	3e8fbce34d	feat: #6392 testeado	2024-02-08 11:08:03 +01:00
Ivan Mas	dee7019824	refs #6443 migrate vn2008.cc_to_iban to util.accountNumberToIban	2024-02-08 10:50:56 +01:00
Jorge Penadés	2940c68516	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-08 08:36:05 +01:00
Jorge Penadés	aff8ee28ea	fix: refs #6272 back & create test	2024-02-07 10:16:47 +01:00
Alex Moreno	e6735f9ea7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-02-07 08:35:54 +01:00
Sergio De la torre	844bab3cc8	#refs 5890 feat:add assignCollection	2024-02-06 16:17:53 +01:00
Javi Gallego	153e002cb8	Merge branch 'dev' into 6392-balance-produccion-propia	2024-02-06 15:54:06 +01:00
Javi Gallego	6a738627e7	feat: #6392 adaptado a los nuevos nombres	2024-02-06 15:42:03 +01:00
Guillermo Bonet	c3174c0c38	Merge branch 'dev' into 6778-changeViewDependencesVn2008	2024-02-06 13:02:30 +00:00
Sergio De la torre	6ebcb53863	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-02-06 10:44:15 +01:00
Alex Moreno	409bf9649f	Merge branch 'dev' into 6757-supplierMayus	2024-02-06 09:29:43 +00:00
Carlos Satorres	318f74072e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6757-supplierMayus	2024-02-06 10:09:11 +01:00
Juanjo Breso	6b5e1ecc01	Merge branch 'dev' into 5167-kk-warehouseAlias-y-warehouseJoined	2024-02-06 09:07:43 +00:00
Juanjo Breso	a949c25860	feat refs #5167 changes required	2024-02-06 10:09:39 +01:00
Juanjo Breso	7ebb9cb429	feat: refs #5167 change required	2024-02-06 09:55:47 +01:00
Ivan Mas	c3912dd098	Merge branch 'dev' into refs-#6665-Clean-Views-vn2008-(1/9)	2024-02-06 08:51:57 +00:00
Juanjo Breso	c4eea81723	Merge branch 'dev' into 5167-kk-warehouseAlias-y-warehouseJoined	2024-02-06 08:43:30 +00:00
Javi Gallego	19ab90a03c	Merge branch 'dev' into 6392-balance-produccion-propia	2024-02-06 09:24:19 +01:00
Guillermo Bonet	8c13ebc5fc	Merge branch 'dev' into 6778-changeViewDependencesVn2008	2024-02-06 08:23:18 +00:00
Ivan Mas	5729ba90d1	Merge branch 'dev' into 6445-Remove-Vn2008.red-Function	2024-02-06 08:04:50 +00:00
Juanjo Breso	923d6a610a	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte2	2024-02-06 07:20:18 +00:00
Juanjo Breso	9f6807204d	feat: refs #5167 changes required	2024-02-06 08:05:30 +01:00
Juanjo Breso	b480df069d	Merge branch 'dev' into 5167-kk-warehouseAlias-y-warehouseJoined	2024-02-06 06:50:40 +00:00
David Domenech	b7bb1b9784	refs #6372 feat: vn2008 to vn	2024-02-06 07:37:33 +01:00
David Domenech	0aed49d603	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6372-Delete-views-from-vn2008	2024-02-06 07:29:42 +01:00
Javi Gallego	990ab82461	Merge branch 'dev' into 6392-balance-produccion-propia	2024-02-06 07:26:35 +01:00
Ivan Mas	6fb198f579	refs #6665 revoke permissions	2024-02-05 13:09:35 +01:00
Alex Moreno	691853df49	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-02-05 12:55:16 +01:00
Guillermo Bonet	80aaaf3fc5	Merge branch 'dev' into 6778-changeViewDependencesVn2008	2024-02-05 08:02:04 +00:00
Guillermo Bonet	d28cacfbad	refactor: refs #6778 Migrated views of vn2008 to vn	2024-02-05 09:02:31 +01:00
Jorge Penadés	17680b2cc7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated	2024-02-05 08:49:48 +01:00
Jorge Penadés	567359ad6a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated	2024-02-05 08:27:42 +01:00
Jorge Penadés	4164fd8250	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund	2024-02-05 08:22:42 +01:00
Juanjo Breso	592e5c877f	Merge branch 'dev' into 5167-kk-warehouseAlias-y-warehouseJoined	2024-02-05 06:49:51 +00:00
Josep Domingo	e704f2eaf7	feat: refs #6689 Deleted view vn2008	2024-02-05 07:11:50 +01:00
Josep Domingo	4b0b4797ad	Merge branch 'dev' into 6689-deleteViewsVn2008-6	2024-02-05 06:00:02 +00:00
Juan Ferrer	c3aeaf4da7	fix: refs #6371 Versions fixed	2024-02-02 23:07:29 +01:00
Jorge Penadés	fde749de57	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated	2024-02-02 15:56:20 +01:00
Ivan Mas	0bd4602568	refs #6445 remove red function and modify precedures	2024-02-02 15:50:16 +01:00
Josep Domingo	1ffbb30d77	refs #6689 feat: delete view vn2008	2024-02-02 14:05:27 +01:00
Jorge Penadés	743f317b20	fix: refs #4466 test & sql	2024-02-02 14:02:16 +01:00
Guillermo Bonet	42bf3db629	fix: refs #6371 Fixed version x2	2024-02-02 13:35:27 +01:00
Guillermo Bonet	2fca40b324	fix: refs #6371 Fixed version	2024-02-02 13:32:25 +01:00
Robert Ferrús	6f5b03195b	Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1	2024-02-02 12:08:09 +00:00
Guillermo Bonet	11b0d787e5	refactor: refs #6780 Revoke grants	2024-02-02 11:57:58 +01:00
Alex Moreno	d5e6750998	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-02-02 09:36:41 +01:00
Javi Gallego	6f4c0f655d	feat: #6392 migrado de database	2024-02-02 08:05:17 +01:00
Robert Ferrús	ff2328fd25	Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1	2024-02-01 11:56:10 +00:00
Alex Moreno	36e8840e6e	Merge branch 'dev' into 6757-supplierMayus	2024-02-01 09:28:59 +00:00
Guillermo Bonet	2ec7a43292	refactor: refs #6780 Changed dependences from vn2008 to vn	2024-02-01 09:49:44 +01:00
Sergio De la torre	39d07b3b59	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-02-01 09:28:08 +01:00
Jorge Penadés	e23bd0489d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-01 08:43:15 +01:00
Jorge Penadés	a2e076e94f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund	2024-02-01 08:36:45 +01:00
Jorge Penadés	51e33887a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund	2024-02-01 08:32:53 +01:00
Guillermo Bonet	5d35519431	Merge branch 'dev' into 6692-viewClean9	2024-02-01 07:29:55 +00:00
Robert Ferrús	805a7f65e7	Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1	2024-02-01 07:20:07 +00:00
Jorge Penadés	af4af43d9f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund	2024-02-01 08:14:50 +01:00
Jorge Penadés	c4161eec97	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-01 08:14:37 +01:00
Guillermo Bonet	0b5395af2b	Merge branch 'dev' into 6692-viewClean9	2024-02-01 07:11:44 +00:00
Guillermo Bonet	386204926f	Merge branch 'dev' into 6690-viewClean7	2024-02-01 07:11:42 +00:00
Carlos Satorres	aa993e7386	refs #6757 fix back, fix upperCase, fix e2e back	2024-01-31 17:01:47 +01:00
David Domenech	bad00167fa	refs #6372 feat: vn2008 to vn	2024-01-31 14:50:56 +01:00
David Domenech	a81a42c2e7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6372-Delete-views-from-vn2008	2024-01-31 14:43:16 +01:00
Jorge Penadés	8f5a5d9cba	fix: refs #6703 tests & backs	2024-01-31 13:11:15 +01:00
Guillermo Bonet	6ebf5f135a	refactor: refs #6235 Deleted views and dependences	2024-01-31 12:14:24 +01:00
Guillermo Bonet	e0d15e572c	Merge branch 'dev' into 6235-addDeviceWorkerTimeControl	2024-01-31 10:13:57 +00:00
Robert Ferrús	57c5c510ff	Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1	2024-01-31 10:05:46 +00:00
Guillermo Bonet	2677bf953d	Merge branch 'dev' into 6690-viewClean7	2024-01-31 09:39:49 +00:00
Guillermo Bonet	a42e20bd5f	refactor: refs #6690 Deleted views and dependences	2024-01-31 10:35:50 +01:00
Jorge Penadés	2c1b8bd9db	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-31 10:02:58 +01:00
Jorge Penadés	6f306ad18c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund	2024-01-31 09:59:57 +01:00
Juanjo Breso	dc1ef34aba	feat: refs #6493 refactorizar procedimientos vn2008 parte2	2024-01-31 09:54:47 +01:00
Juanjo Breso	18772c04f6	feat: refs #5167 update	2024-01-31 09:38:57 +01:00
Jorge Penadés	c136395d1e	fix: refs #6703 fix conflicts	2024-01-31 09:16:38 +01:00
Jorge Penadés	d43976192a	fix: refs #6703 fix conflicts	2024-01-31 09:16:26 +01:00
Guillermo Bonet	dd17b2c05d	feat: refs #6235 Added device in clockIn	2024-01-31 09:04:30 +01:00
Sergio De la torre	f88cef6745	refs #6186 feat:deprecated packingShelve	2024-01-31 08:45:52 +01:00
Sergio De la torre	7f563f99bb	refs #5890 feat:reserves	2024-01-31 07:11:03 +01:00
Jorge Penadés	e17fc91415	fix: refs #6276 fix acl, addSaleByCode & tests	2024-01-30 14:58:11 +01:00
Jorge Penadés	88dfdb157f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-30 11:25:17 +01:00
Robert Ferrús	22fa1d4c3f	Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1	2024-01-30 09:23:16 +01:00
Robert Ferrús	3a9eb100a1	feat: refs #6371 table vn2008 to vn	2024-01-30 08:06:36 +01:00
Guillermo Bonet	7a6d2ce984	Merge branch 'dev' into 6725-deletedFkLogs	2024-01-30 06:01:31 +00:00
Guillermo Bonet	8484afe2ea	refactor: #6725 Deleted originFk from log tables	2024-01-29 14:29:10 +01:00
Javier Segarra	7880f41d1c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6174_refactor_invoicePdfNotify	2024-01-29 14:11:08 +01:00
Javier Segarra	5396b402a5	refs #6174 feat: acl	2024-01-29 14:10:30 +01:00
Robert Ferrús	eb208edacc	feat: refs #6371 pasar vn2008 a vn part1	2024-01-29 12:35:49 +01:00
Guillermo Bonet	2268ef377f	feat: #6625 Changed version to myt	2024-01-29 12:32:50 +01:00
Alex Moreno	cf0e74c457	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-01-29 11:37:53 +01:00
Jorge Penadés	293bbd3da3	fix: refs #6276 merge database	2024-01-29 09:31:12 +01:00
David Domenech	8ea3c98a13	refs #6372 feat: vn2008 to vn	2024-01-29 09:12:29 +01:00
Jorge Penadés	72e5050d93	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-29 08:37:55 +01:00
Juan Ferrer	1ad1e53970	feat: refs #5483 update db files	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