1293 Commits

Author	SHA1	Message	Date
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
Pako Natek	4bf00bd428	version 240625	2024-06-25 12:51:14 +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
Carlos Andrés	68f48de6f0	feat: sincro client supplier sage refs #7595	2024-06-20 17:14:38 +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	414bf9eb03	feat: sincro client supplier sage refs #7595	2024-06-20 14:48:32 +02: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
Robert Ferrús	a42562b0ca	fear: refs #5855 claim_ratio_routine	2024-06-19 10:01:32 +02: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
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	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