1138 Commits

Author	SHA1	Message	Date
Guillermo Bonet	2278b9a05a	feat: refs #7382 Changes	2024-07-03 14:20:43 +02:00
Robert Ferrús	4f9552379e	feat: refs #7654 entry_splitByShelving	2024-07-03 13:46:19 +02:00
Guillermo Bonet	cf63d6e71c	feat: refs #7378 Added productionConfigLog	2024-07-03 11:17:33 +02:00
Javi Gallego	a8d663bee4	feat: refs #7348 hasDailyInvoice field	2024-07-03 10:49:51 +02:00
Guillermo Bonet	d1a38ec589	Merge pull request 'refactor: refs #7424 Component type refactor' (!2656) from 7424-componentType into dev ... Reviewed-on: #2656 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-03 05:22:48 +00:00
Javi Gallego	0d70cb8929	fix: informatica no necesita este correo	2024-07-02 17:39:46 +02:00
Robert Ferrús	872ab1a758	Merge branch 'dev' into 5855-temporaryTable	2024-07-02 11:08:08 +00:00
Guillermo Bonet	edff15662c	Merge branch 'master' into test	2024-07-02 12:34:51 +02:00
Guillermo Bonet	028278ebcf	refs #6626 Hotfix	2024-07-02 11:52:25 +02:00
Guillermo Bonet	b6b3da0771	Merge branch 'test' into dev	2024-07-02 08:06:54 +02:00
Guillermo Bonet	a7c7c4c2f6	Merge pull request 'fix: refs #7552 Hotfix' (!2655) from 7552-itemGetSimilarFix into master ... Reviewed-on: #2655 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-02 05:35:52 +00:00
Sergio De la torre	1ca22dab92	Merge branch 'dev' into 7575_setParking_regExp	2024-07-01 14:36:18 +00:00
Guillermo Bonet	cafa7bce44	Merge branch 'test' into dev	2024-07-01 13:40:31 +02:00
Guillermo Bonet	a0ea742f9e	fix: refs #7486 Hotfix	2024-07-01 13:38:25 +02:00
Guillermo Bonet	a23f485296	refactor: refs #7424 Component type refactor	2024-07-01 11:11:16 +02:00
Guillermo Bonet	8409ffa950	fix: refs #7552 Hotfix	2024-07-01 10:26:46 +02:00
Guillermo Bonet	2bf06d8add	fix: refs #7552 Hotfix	2024-07-01 10:06:34 +02:00
Sergio De la torre	3ad2346504	feat refactor setParking REGEXP refs #7575	2024-07-01 09:25:00 +02:00
Guillermo Bonet	57a879723e	Merge branch 'test' into dev	2024-07-01 07:39:19 +02:00
Guillermo Bonet	f73176375b	Merge pull request 'hotfix: refs #7640 multiple inventory' (!2645) from 7640-multipleInventory into master ... Reviewed-on: #2645 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-01 05:30:31 +00:00
Guillermo Bonet	df4e5deae6	Merge branch 'test' into dev	2024-06-28 13:33:43 +02:00
Guillermo Bonet	08c9d43b17	refs #7486 Declare exit handler fix collection_assign error	2024-06-28 13:30:08 +02:00
Guillermo Bonet	9164901eac	refs #7640 Requested changes	2024-06-27 13:26:59 +02:00
Sergio De la torre	746fa82f2a	feat expeditionPalletPrint refs #5210	2024-06-27 13:20:52 +02:00
Carlos Andrés	cbd46330b3	feat: Turn issues into calculated columns refs#7213	2024-06-27 13:01:42 +02:00
Guillermo Bonet	e8dc6eafdc	refs #7640 multiple inventory	2024-06-27 10:18:43 +02:00
Robert Ferrús	0379142fb5	Merge branch 'dev' into 5855-temporaryTable	2024-06-26 11:30:38 +00:00
Guillermo Bonet	ad4dd088a3	Merge branch 'test' into dev	2024-06-26 11:58:43 +02:00
Guillermo Bonet	220f402f4e	Merge pull request 'horfix: ticket 197676' (!2640) from ticket197676-hotfix into master ... Reviewed-on: #2640 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-26 09:53:25 +00:00
Guillermo Bonet	c4af92e9ba	horfix: ticket 197676	2024-06-26 09:54:51 +02:00
Carlos Andrés	75486ae743	Hotfix ticketStateUpdate to ticket_setState	2024-06-25 19:47:22 +02:00
Carlos Andrés	5bcdc57978	Hotfix ticketStateUpdate to ticket_setState	2024-06-25 19:33:54 +02:00
Carlos Andrés	82118ae933	Hotfix ticketStateUpdate to ticket_setState	2024-06-25 19:30:59 +02:00
Robert Ferrús	c4eb7670fe	Merge branch 'dev' into 5855-temporaryTable	2024-06-25 12:59:48 +00:00
Guillermo Bonet	b9278f3b3a	Merge branch 'test' into dev	2024-06-25 14:02:16 +02:00
Guillermo Bonet	2e1ab3af20	refs #7486 Fix same assign collection	2024-06-25 14:00:46 +02:00
Carlos Andrés	ff1918ef06	Merge pull request 'feat: previas con sitema de reservas refs #6861' (!2176) from 6861-Pasar-modo-trabajo-de-previa-a-reservas into dev ... Reviewed-on: #2176 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-25 11:21:02 +00:00
Alex Moreno	85854e0713	warmFix: use vn	2024-06-25 13:14:44 +02:00
Alex Moreno	45e8674087	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-25 11:34:35 +02:00
Alex Moreno	cf0f80142f	hotFix: create view vn.expeditionTruck	2024-06-25 09:24:34 +02:00
Robert Ferrús	205d79f0a6	Merge branch 'dev' into 5855-temporaryTable	2024-06-25 06:13:16 +00:00
Alex Moreno	0284f3b1ce	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-25 07:30:20 +02:00
Alex Moreno	f2ee1df8ac	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-06-25 07:29:56 +02:00
Carlos Andrés	cf79711f6a	feat: previas con sitema de reservas refs #6861	2024-06-24 13:30:03 +02:00
Pako Natek	c32a87126c	Merge branch 'master' into supplierPackaging_ReportSource_masterHotFix	2024-06-24 10:50:31 +00:00
Pako Natek	5f329fde38	or replace	2024-06-24 10:32:51 +02:00
Pako Natek	f999010c6c	tested proc	2024-06-24 10:32:12 +02:00
Pako Natek	8c5f468087	tested proc	2024-06-24 10:30:25 +02:00
Robert Ferrús	a170edcdef	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5855-temporaryTable	2024-06-24 08:09:52 +02:00
Pablo Natek	ea0b0dc779	fix: business overlapping	2024-06-24 08:08:39 +02:00
Robert Ferrús	9022f62116	feat: refs #5855 changes required	2024-06-24 08:03:43 +02:00
Sergio De la torre	429149d4e0	Merge branch 'dev' into 7023_itemShelving_filterBuyer	2024-06-24 05:05:27 +00:00
Sergio De la torre	4131653700	feat itemShelving_filterBuyer refs #7023	2024-06-21 13:02:36 +02:00
Sergio De la torre	3fa7eb1d2a	feat itemShelving_filterBuyer refs #7023	2024-06-21 13:01:19 +02:00
Pako Natek	7347c50f8e	Merge branch 'dev' into 7420-supplierPackaging_reportSource_update	2024-06-21 06:33:15 +00:00
Pako Natek	fe154b9ee8	sref	2024-06-21 08:32:22 +02:00
Guillermo Bonet	6874474207	Merge pull request 'refactor: refs #7519 Refactor claim_ratio_routine' (!2394) from 6701-claimRatioRoutine into dev ... Reviewed-on: #2394 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-21 05:05:20 +00:00
Guillermo Bonet	a899ecaab7	Merge pull request 'refactor: refs #7490 Deleted update duaInvoiceInBooking' (!2561) from 7490-duaInvoiceInBooking into dev ... Reviewed-on: #2561 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-21 05:04:32 +00:00
Carlos Andrés	f7b8bd2df6	Merge branch '6861-Pasar-modo-trabajo-de-previa-a-reservas' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-06-20 18:18:05 +02:00
Carlos Andrés	ed49c98c1c	fnpmeat: previas con sitema de reservas refs #6861	2024-06-20 18:18:03 +02:00
Sergio De la torre	9b0913e439	Merge branch 'dev' into 7023_itemShelving_filterBuyer	2024-06-20 14:36:25 +00:00
Carlos Andrés	b5cd57e660	Merge pull request 'test' (!2621) from test into dev ... Reviewed-on: #2621 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-06-20 13:47:11 +00:00
Carlos Andrés	691413a854	Merge pull request 'master' (!2620) from master into test ... Reviewed-on: #2620 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-06-20 13:44:37 +00:00
Carlos Andrés	11675c2e35	Merge pull request 'feat: sincro client supplier sage refs #7595' (!2618) from 7595---Sincronizar-cambios-clientes-y-proveedores-con-Sage into master ... Reviewed-on: #2618 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-20 13:34:55 +00:00
Carlos Andrés	e0d105313d	feat: sincro client supplier sage refs #7595	2024-06-20 14:27:11 +02:00
Sergio De la torre	c1c01df3c3	feat itemShelving_filterBuyer refs #7023	2024-06-20 09:37:22 +02:00
Javi Gallego	018972b948	Merge pull request 'feat: refs #7216 logUnpaid' (!2609) from 7216-clientUnpaid into dev ... Reviewed-on: #2609 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-06-20 05:50:14 +00:00
Javi Gallego	1a8df4d87c	feat: refs #7216 triggers	2024-06-19 13:41:37 +02:00
Robert Ferrús	0128dfd967	feat: refs #5855 changes required	2024-06-19 11:30:50 +02:00
Pako Natek	49e01218e9	Warehouse name	2024-06-19 10:45:37 +02:00
Robert Ferrús	1e3376f908	Merge branch 'dev' into 5855-temporaryTable	2024-06-19 08:05:01 +00:00
Pako Natek	1fa0a841da	TP previous	2024-06-19 07:26:30 +02:00
Pako Natek	bf62f40c87	actualizada la rama	2024-06-19 07:17:25 +02:00
Pako Natek	66ed958c72	Merge branch 'dev' into 7420-supplierPackaging_ReportSource	2024-06-18 09:07:24 +00:00
Guillermo Bonet	b7fadddbb1	Merge branch 'master' into dev	2024-06-18 11:03:56 +02:00
Guillermo Bonet	4d5f3e43ed	Merge branch 'master' into test	2024-06-18 11:03:49 +02:00
Guillermo Bonet	2b1de271a9	refs #7552 Added force vShowType true	2024-06-18 11:03:30 +02:00
Pako Natek	3711f26b5f	Merge branch 'dev' into 7420-supplierPackaging_ReportSource	2024-06-18 06:24:59 +00:00
Pako Natek	9fc027a3c6	tickets deleted excluded	2024-06-18 08:24:06 +02:00
Guillermo Bonet	a84badff87	Merge branch 'test' into dev	2024-06-17 14:52:55 +02:00
Guillermo Bonet	ce709798b4	hotfix: refs #7486 collection_new debug error	2024-06-17 14:51:04 +02:00
Guillermo Bonet	664f4299b3	Merge branch 'test' into dev	2024-06-17 13:42:51 +02:00
Guillermo Bonet	131b44305d	hotfix: refs #7552 item_getSimilar	2024-06-17 13:38:40 +02:00
Guillermo Bonet	b4377e36e2	Merge branch 'test' into dev	2024-06-17 11:45:19 +02:00
Guillermo Bonet	4c345ffa93	hotfix: refs #7552 item_getSimilar	2024-06-17 10:57:23 +02:00
Guillermo Bonet	43df0ef55d	Merge branch 'dev' into 6701-claimRatioRoutine	2024-06-17 07:42:33 +00:00
Guillermo Bonet	1d0b89ed52	refs #7519 Requested changes	2024-06-17 09:42:16 +02:00
Carlos Andrés	51078c804b	Ticket #194195 Recupero vn.item_getAtp	2024-06-14 16:32:13 +02:00
Carlos Andrés	5473f7a308	Hotfix Ticket #194195 Error radar negativos	2024-06-14 16:01:27 +02:00
Robert Ferrús	df6de7e74c	fix: refs #194195 item_getAtp	2024-06-14 14:55:03 +02:00
Robert Ferrús	8dea9598e8	fix: refs #194195 item_getAtp	2024-06-14 13:54:43 +02:00
Guillermo Bonet	9b80ef73a8	Merge branch 'test' into dev	2024-06-14 12:48:00 +02:00
Guillermo Bonet	798bf6d028	hotfix: refs #6281 itemShelving_add buy is required	2024-06-14 12:41:46 +02:00
Robert Ferrús	828908a522	Merge branch 'dev' into 5855-temporaryTable	2024-06-14 06:07:39 +00:00
Robert Ferrús	831b2c39f6	Merge branch 'dev' into 5855-temporaryTable	2024-06-14 06:06:54 +00:00
Ivan Mas	615fd3e97b	refs #7530 delete trigger deviceProductionConfig_afterUpdate	2024-06-13 15:10:04 +02:00
Sergio De la torre	c2e4e187d6	feat itemShelvingSale refs #6861	2024-06-13 14:21:59 +02:00
Guillermo Bonet	cfc5e32715	feat: refs #6701 Fix error	2024-06-13 13:11:50 +02:00
Guillermo Bonet	cb056ff789	Merge branch 'dev' into 6701-claimRatioRoutine	2024-06-13 11:14:00 +02:00
Sergio De la torre	5340729ead	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-06-13 11:07:57 +02:00
Guillermo Bonet	53c732bcb9	Merge branch 'test' into dev	2024-06-13 07:12:10 +02:00
Guillermo Bonet	d7317e4067	hotfix: refs #7024 Modify booked entries	2024-06-13 07:09:48 +02:00
Carlos Andrés	30caf79490	feat: previas con sitema de reservas refs #6861	2024-06-12 16:12:06 +02:00
Guillermo Bonet	d0b926b2c5	feat: refs #7490 Changes	2024-06-12 14:26:26 +02:00
Alex Moreno	671978ec02	Merge branch 'dev' into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-06-12 10:21:36 +00:00
Guillermo Bonet	17fa1e10f6	feat: refs #6701 Added claimRatio_afterInsert	2024-06-12 07:33:10 +02:00
Carlos Andrés	b9d1c3228b	feat: previas con sitema de reservas refs #6861	2024-06-11 18:43:26 +02:00
Guillermo Bonet	aa0e06cfec	refactor: refs #7505 Changed name	2024-06-11 14:00:59 +02:00
Guillermo Bonet	3bd596e5fd	refactor: refs #7505 Added description	2024-06-11 13:53:41 +02:00
Guillermo Bonet	4f10a93584	refactor: refs #7505 Minor change	2024-06-11 13:36:46 +02:00
Guillermo Bonet	a9aad7406a	refactor: refs #7505 Minor change	2024-06-11 12:51:36 +02:00
Carlos Andrés	d75e008a23	feat: previas con sitema de reservas refs #6861	2024-06-11 12:49:33 +02:00
Carlos Andrés	ed7218c133	feat: previas con sitema de reservas refs #6861	2024-06-11 12:44:25 +02:00
Guillermo Bonet	9f9063567a	refactor: refs #7505 item_getVisible refactor	2024-06-11 12:40:07 +02:00
Guillermo Bonet	76f76b8304	feat: refs #7568 Added freelancer exception	2024-06-11 10:48:24 +02:00
Alex Moreno	9c2ccc5df4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-11 09:59:09 +02:00
Guillermo Bonet	bd13ecd464	refactor: refs #7486 engine memory and primary key sales_merge	2024-06-11 07:59:53 +02:00
Alex Moreno	c241189508	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-10 14:22:12 +02:00
Guillermo Bonet	75a529830c	Merge pull request 'refactor: refs #7486 Optimized procs' (!2564) from 7486-productionControl into test ... Reviewed-on: #2564 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-10 11:33:10 +00:00
Guillermo Bonet	9d82f0ff7c	Merge branch 'test' into dev	2024-06-10 12:48:53 +02:00
Guillermo Bonet	37fa92aca8	Merge branch 'master' into test	2024-06-10 12:48:38 +02:00
Guillermo Bonet	272a34c5f9	refactor: refs #7486 Added userFk debug	2024-06-10 12:46:26 +02:00
Guillermo Bonet	7579e15fcc	refactor: refs #7486 Optimized procs	2024-06-10 11:55:40 +02:00
Guillermo Bonet	b4820858c9	hotfix: ticket 192672 ticketPreviousPreparingList	2024-06-10 11:32:44 +02:00
Javi Gallego	b4046de190	Merge branch 'dev' into 4560-GastosReparto	2024-06-10 08:17:17 +00:00
Guillermo Bonet	ca7d67451b	refactor: refs #7517 Minor changes	2024-06-10 09:09:11 +02:00
Guillermo Bonet	2e8d28d795	refactor: refs #7517 Added throw	2024-06-10 09:08:26 +02:00
Guillermo Bonet	317f898c2e	refactor: refs #7490 Minor changes	2024-06-10 08:48:56 +02:00
Guillermo Bonet	a4f8c0df80	Merge branch '7490-duaInvoiceInBooking' of https://gitea.verdnatura.es/verdnatura/salix into 7490-duaInvoiceInBooking	2024-06-10 08:47:03 +02:00
Guillermo Bonet	fb4be69cf1	refactor: refs #7490 Added final update	2024-06-10 08:47:02 +02:00
Guillermo Bonet	e043badc19	Merge branch 'dev' into 7490-duaInvoiceInBooking	2024-06-10 06:39:15 +00:00
Guillermo Bonet	9b21cd5eb1	refactor: refs #7490 Deleted update duaInvoiceInBooking	2024-06-10 08:38:58 +02:00
Sergio De la torre	4cf5c0775c	feat isScannedExpedition refs #7276	2024-06-10 07:30:33 +02:00
Carlos Andrés	1497146940	Merge branch 'master' into Hotfix-midnight-determinist	2024-06-07 16:17:11 +02:00
Javi Gallego	f82f452423	Merge branch 'dev' into 7276_expeditionScanned	2024-06-07 13:44:24 +00:00
Javi Gallego	0c068ed126	Merge branch 'dev' into 4560-GastosReparto	2024-06-07 09:03:24 +00:00
Sergio De la torre	7c0fa6dbb9	feat isScannedExpedition refs #7276	2024-06-07 09:18:52 +02:00
Guillermo Bonet	aff0de23eb	Merge branch 'test' into dev	2024-06-07 08:29:28 +02:00
Guillermo Bonet	b6fb7650cd	Merge branch 'master' into test	2024-06-07 08:29:04 +02:00
Robert Ferrús	d8e6a94797	Merge branch 'dev' into 7544-claimChangeState	2024-06-06 12:31:08 +00:00
Ivan Mas	a8f5993c21	Merge branch 'dev' into 7536-TPV_Wrong_abajo_field	2024-06-06 10:12:45 +00:00
Robert Ferrús	ef50d493f1	feat: refs #7544	2024-06-06 11:54:39 +02:00
Javi Gallego	e77bc87a2a	Merge pull request 'feat: refs #7203 remove numbres alertLevel' (!2546) from 7203-alertLevel into dev ... Reviewed-on: #2546 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-06 09:48:29 +00:00
Robert Ferrús	1c6e881273	feat: refs #7544 crear evento claim_changeState	2024-06-06 11:45:09 +02:00
Robert Ferrús	7f23c81756	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5855-temporaryTable	2024-06-06 07:28:40 +02:00
Carlos Andrés	b78ef97813	Hotfix modificar entradas contabilizadas Ticket 191417	2024-06-05 15:50:16 +02:00
Carlos Andrés	638a5e9a1e	Hotfix modificar entradas contabilizadas Ticket 191417	2024-06-05 15:44:11 +02:00
Ivan Mas	8458651ce0	Merge branch 'dev' into 7536-TPV_Wrong_abajo_field	2024-06-05 12:57:47 +00:00
Ivan Mas	71ea1d1467	refs #7536 modify itemShelvingRadar	2024-06-05 14:53:59 +02:00
Guillermo Bonet	feda14a21b	Merge branch 'test' into dev	2024-06-05 14:23:09 +02:00