749 Commits

Author	SHA1	Message	Date
Javi Gallego	7d3870e4a1	feat: refs#6382 test fixed	2024-04-25 14:28:47 +02:00
Javier Casado	a9e4b2cd36	Merge branch 'dev' into 6697-removeClaimQuantity	2024-04-25 11:46:53 +00:00
Javi Gallego	a4f1183df6	feat: refs #7108 pascalCase	2024-04-25 13:11:57 +02:00
Pablo Natek	c5b02dc239	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency	2024-04-25 09:46:53 +02:00
Pablo Natek	42591af5c7	fix: refs #4988 create table	2024-04-25 09:46:15 +02:00
Javi Gallego	1b34822fb7	Merge branch 'dev' into 6382-regularizar-Shelving-Parking	2024-04-25 07:13:57 +00:00
Pablo Natek	f2d4283304	fix: refs #7187 number on de code	2024-04-24 14:29:57 +02:00
Pablo Natek	e8a32d8e13	fix: refs #7187 db version	2024-04-24 14:09:42 +02:00
Pablo Natek	008b6f6f41	fix: refs #7187 unify versions	2024-04-24 14:08:26 +02:00
Pablo Natek	88ef12032b	feat: refs #7187 serialNumber new column	2024-04-24 14:05:18 +02:00
jcasado	aeee012c2b	refs #6697 fix sql test	2024-04-24 11:43:10 +02:00
Guillermo Bonet	6fb87531c4	refactor: #7258 Deprecated last tables vn2008	2024-04-24 11:27:16 +02:00
Pablo Natek	a15970c95f	fix: refs #7187 sql for pdaFreelancer	2024-04-24 11:08:57 +02:00
Jon Elias	6706974784	fix: refs #6731 fix ticketRequest	2024-04-24 10:31:26 +02:00
Guillermo Bonet	f7ebd071bf	refactor: #7258 Deleted all dependences of vn2008 schema	2024-04-24 09:53:31 +02:00
Robert Ferrús	ffe56edc9c	feat: refs #7039 country	2024-04-24 09:24:42 +02:00
Robert Ferrús	a27e06e8ff	feat: refs #7039 country	2024-04-24 09:08:19 +02:00
Robert Ferrús	7899cf230e	feat: refs #7039 country	2024-04-24 09:05:29 +02:00
Javi Gallego	73f7d09b0e	feat: #7108 acl a invoiceIn	2024-04-24 08:14:07 +02:00
Javi Gallego	dcc46494bc	Merge branch 'dev' into 7108-exchange-rate	2024-04-24 07:45:02 +02:00
Pablo Natek	fbc1614132	fix: refs #7187 sql creation for deviceProductionUser	2024-04-23 18:50:28 +02:00
Juanjo Breso	79172ef288	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-23 10:16:27 +00:00
Carlos Andrés	2d5daf55c2	Merge pull request 'feat: Varias líneas farming en albaranes refs #7020' (!2349) from 7020-Varias-líneas-farming-en-albaranes into dev ... Reviewed-on: #2349 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-23 10:04:08 +00:00
Juanjo Breso	d7e4dd4fc7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-23 08:03:17 +02:00
Javi Gallego	eaf2762922	feat: #6382 chekCodeFormat	2024-04-23 07:57:37 +02:00
Juan Ferrer	d58607f26e	Merge branch 'dev' into 4409-binlog	2024-04-22 19:43:48 +00:00
Carlos Andrés	8bb331f0ed	feat: Varias líneas farming en albaranes refs #7020	2024-04-22 19:57:17 +02:00
Pablo Natek	adc3b413f5	feat: refs #4988 agency add module	2024-04-22 17:17:17 +02:00
Robert Ferrús	44f2cd4efc	feat: refs #7247 clientSupplier_add	2024-04-22 14:04:07 +02:00
Ivan Mas	f380e0d1ce	Merge branch 'dev' into 7021-Delete_rfid_schema	2024-04-22 11:17:54 +00:00
Guillermo Bonet	eb9f81c81d	feat #7181 Rollback creditInsurance_getRisk	2024-04-22 13:05:16 +02:00
Ivan Mas	1ef98ecd8c	Merge branch 'dev' into 7021-Delete_rfid_schema	2024-04-22 10:37:15 +00:00
Sergio De la torre	0f05fe5d93	Merge branch 'dev' into 6921_addFromDelivery	2024-04-22 10:32:03 +00:00
Javi Gallego	4416790ce1	Merge branch 'dev' into 7108-exchange-rate	2024-04-22 11:45:02 +02:00
Robert Ferrús	6a0a944319	Merge branch 'dev' into 7029-packagingVolumeRestriction	2024-04-22 07:23:18 +00:00
Juan Ferrer	bc45cafb40	Merge branch 'dev' into 4409-binlog	2024-04-22 08:54:14 +02:00
Carlos Andrés	fd903f27c0	fix: descuentos en bs.ventas refs #6974	2024-04-21 16:01:32 +02:00
Ivan Mas	ad317cb5e5	refs #7021 Delete rfid schema	2024-04-19 14:11:35 +02:00
Carlos Andrés	27d59f4a8f	fix: descuentos en bs.ventas refs #6974	2024-04-18 19:12:24 +02:00
Sergio De la torre	279c300fbf	Merge branch 'dev' into 6921_addFromDelivery	2024-04-18 11:08:15 +00:00
Guillermo Bonet	2b11f85b67	Merge pull request 'feat: refs #6724 permissions to vn.entry.isBooked' (!2147) from 6724-permisos-vn.entry.isBooked into dev ... Reviewed-on: #2147 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-18 11:06:47 +00:00
Pablo Natek	77f7348acb	feat(workcenter): refs #4988 add workcenter config menu	2024-04-18 09:02:01 +02:00
Sergio De la torre	76fb9bf7a8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery	2024-04-18 07:12:43 +02:00
Sergio De la torre	32e2827287	refs #6921 feat: addFromDelivery	2024-04-17 13:55:07 +02:00
Sergio De la torre	a3c8532661	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery	2024-04-17 13:27:00 +02:00
Juan Ferrer	7cda14c424	Merge branch 'dev' into 4409-binlog	2024-04-17 13:24:32 +02:00
Juan Ferrer	ae326e6e2e	feat(binlog): refs #4409 Old recalc code removed ... Queues: orderTotal, ticketTotal and travelEntries	2024-04-17 13:21:27 +02:00
Robert Ferrús	3e5b6a9ad1	Merge branch 'dev' into 6500-procRefactor8	2024-04-17 09:01:39 +00:00
Guillermo Bonet	cffc1964b6	feat: refs #6968 Transactioned and isTriggerDisabled	2024-04-17 10:26:21 +02:00
Sergio De la torre	ae88a8a281	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery	2024-04-17 07:44:08 +02:00
Juanjo Breso	81b2e89fd8	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-17 05:30:39 +00:00
Carlos Andrés	d53f19b47d	feat: Turn problems into calculated columns	2024-04-16 17:01:14 +02:00
Pablo Natek	d0dfdc668b	feat(agency): refs #4988 add new agency	2024-04-16 16:25:27 +02:00
Guillermo Bonet	7a557be09a	feat: refs #6968 Changed groupingMode to enum	2024-04-16 11:07:57 +02:00
Jorge Penadés	976b18203e	feat: refs #7187 check if is freelancer on insert & update	2024-04-16 10:49:17 +02:00
Robert Ferrús	ffd7b3cf50	Merge branch 'dev' into 6500-procRefactor8	2024-04-16 08:39:08 +00:00
Javi Gallego	58baa45e09	Merge branch 'dev' into 7108-exchange-rate	2024-04-16 09:47:21 +02:00
Pablo Natek	0418540ef9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency	2024-04-16 07:39:13 +02:00
Pablo Natek	336c3274ea	feat(agency): refs #4988 add summary	2024-04-16 07:38:48 +02:00
Guillermo Bonet	0f26fb46b6	feat: refs #6724 Grant changes	2024-04-15 13:16:36 +02:00
Guillermo Bonet	78bd561122	Merge branch 'dev' into 6724-permisos-vn.entry.isBooked	2024-04-15 11:11:55 +00:00
Sergio De la torre	4cb79956a6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery	2024-04-15 13:03:47 +02:00
Jorge Penadés	200cbd8d74	fix: refs #6938 acls & scope	2024-04-15 11:03:57 +02:00
Jorge Penadés	a68b8431c5	feat: refs #6938 add scope & acls	2024-04-15 10:21:59 +02:00
Robert Ferrús	36b3a92ca3	Merge branch 'dev' into 6500-procRefactor8	2024-04-15 05:18:54 +00:00
Javi Gallego	bb6ea31bf7	feat: funcional a falta de test	2024-04-12 10:26:32 +02:00
Pablo Natek	0d03cf76b4	fix(sql): refs #6005 fix fk formation	2024-04-12 10:17:04 +02:00
Pablo Natek	3547299c70	Merge pull request '6005-backupLabeler' (!2276) from 6005-backupLabeler into dev ... Reviewed-on: #2276 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-04-12 07:12:53 +00:00
Pablo Natek	aaef10b8d8	feat(collection-label): refs #6602 add qr to the report	2024-04-12 08:48:29 +02:00
Robert Ferrús	800fa36d04	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6500-procRefactor8	2024-04-12 08:40:50 +02:00
Guillermo Bonet	b5f3b5ebee	Fix version	2024-04-12 08:19:57 +02:00
Guillermo Bonet	c0cabc894b	refactor: refs #7181 Added grant	2024-04-12 08:08:49 +02:00
Guillermo Bonet	69280c63b4	Merge branch 'master' into test	2024-04-12 08:03:12 +02:00
Pablo Natek	726b1ddc07	Merge branch 'dev' into 6005-backupLabeler	2024-04-12 05:14:29 +00:00
Robert Ferrús	04c5a9a004	Merge branch 'dev' into 6500-procRefactor8	2024-04-11 12:21:32 +00:00
Juanjo Breso	aee638c3a9	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-11 11:43:07 +00:00
Juan Ferrer	ce55058314	feat(pbx): refs #7198 country prefix, schedule	2024-04-10 18:14:10 +02:00
Ivan Mas	83befbd120	Merge branch 'dev' into 6827-check-usernames-special-characters	2024-04-10 15:21:42 +00:00
Robert Ferrús	e2eff4df54	Merge branch 'dev' into 6500-procRefactor8	2024-04-10 12:04:40 +00:00
Ivan Mas	85301b84bc	Merge branch 'dev' into 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal	2024-04-10 11:18:31 +00:00
Sergio De la torre	0ef7082249	Merge branch 'dev' into 6921_addFromDelivery	2024-04-10 10:02:57 +00:00
Sergio De la torre	0956dbc7b1	refs #6921 feat: addFromDelivery	2024-04-10 11:32:45 +02:00
Jorge Penadés	099fb70582	Merge branch 'dev' into 6492-refactorProceduresVn2008	2024-04-10 09:29:15 +00:00
Pablo Natek	5602ed8835	Merge branch 'dev' into 6005-backupLabeler	2024-04-10 07:17:42 +00:00
Robert Ferrús	2c91385e62	Merge branch '7150-greuge_dif_porte_add' of https://gitea.verdnatura.es/verdnatura/salix into 7150-greuge_dif_porte_add	2024-04-10 08:09:57 +02:00
Robert Ferrús	c30c0de92c	feat: refs #7150	2024-04-10 08:09:54 +02:00
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
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
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
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
Guillermo Bonet	29eee4e8a7	Merge branch 'test' into dev	2024-04-04 11:30:03 +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
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
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
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
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
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
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