140 Commits

Author	SHA1	Message	Date
Javi Gallego	0175d361d7	refactor: refs #6802 update variable names for consistency and clarity	2025-01-31 16:16:16 +01:00
Javi Gallego	ca017d8a5a	fix: refs #6802 update chat mentions from '@' to '#' for department notifications and claims	2025-01-30 14:45:23 +01:00
Javi Gallego	3918018235	Merge branch 'dev' into 6802-Clientes-gestionados-por-equipos	2025-01-30 09:31:38 +01:00
Sergio De la torre	5dd60bd912	fix: refs #6861 refs#6861 showUsername	2025-01-24 08:28:15 +01:00
Sergio De la torre	df97534882	fix: refs #6861 refs#6861 showUsername	2025-01-24 08:25:44 +01:00
Javi Gallego	d85f7e473f	refactor: refs #6802 rename salesDepartment to department for consistency and clarity	2025-01-23 14:26:12 +01:00
Javi Gallego	ab7fd13284	Merge branch 'dev' into 6802-Clientes-gestionados-por-equipos	2025-01-22 10:13:27 +01:00
Sergio De la torre	70ad6e2624	fix: refs #6861 refs·6861 ticketOrderReserve	2025-01-08 10:25:08 +01:00
Guillermo Bonet	c14484366e	Merge branch 'test' into dev	2024-11-26 10:10:09 +01:00
Sergio De la torre	0b5ef35d22	feat: refs #8213 refs#8213 picker ItemShelvingSale	2024-11-25 16:16:47 +01:00
Javi Gallego	80851e094d	Merge branch 'dev' into 7821-entryIsBooked	2024-11-21 13:28:54 +01:00
Javi Gallego	b3ce3a0cc2	feat: refs #7821 with test	2024-11-21 09:12:04 +01:00
Guillermo Bonet	d302a9c3ba	Merge branch 'master' into test	2024-11-20 12:17:30 +01:00
Guillermo Bonet	a4b568e9b8	fix: refs #8191 Deleted msg send rocket in getSales.js	2024-11-20 12:03:30 +01:00
Alex Moreno	7f39edf014	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-11-19 07:46:43 +01:00
Guillermo Bonet	b3bf0024e3	refactor: refs #7920 Major changes	2024-11-13 11:15:31 +01:00
Sergio De la torre	3a8c37aef8	fix: refs #6861 refs#6861 getTickets	2024-11-12 11:59:51 +01:00
Sergio De la torre	b592ccc162	fix: refs #6861 getTickets	2024-10-15 17:01:09 +02:00
Sergio De la torre	d164cccee5	fix: refs #6861 assignCollection	2024-10-07 16:14:16 +02:00
Javi Gallego	e2f1fea6be	fix: refs #7277 error test	2024-08-30 17:04:45 +02:00
Sergio De la torre	d97aba8e10	hotFix getTickets refs #6861	2024-07-30 17:28:55 +02:00
Guillermo Bonet	9e18a208b2	fix: refs #7662 get value for proc with select for updates	2024-07-25 13:26:45 +02:00
Alex Moreno	eb413af275	hotFix: collection assign	2024-07-23 10:48:12 +02:00
Guillermo Bonet	fa10376bea	fix: refs #7662 assign	2024-07-23 10:21:09 +02:00
Alex Moreno	4fa9f057de	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-16 07:41:21 +02:00
Sergio De la torre	cb107215b6	feat itemShelvingSale refs #6861	2024-07-12 13:14:00 +02:00
Carlos Andrés	dc897854a4	merge: refs #6802 merge dev fix conflicts	2024-07-11 13:59:55 +02:00
Carlos Andrés	3b5f88fd33	refactor: refs #6802 refactor salesPerson to salesDepartment	2024-07-11 12:30:43 +02:00
Alex Moreno	706288f227	Merge pull request 'test' (!2687) from test into dev ... Reviewed-on: #2687 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-05 08:59:39 +00:00
Sergio De la torre	f3f450463b	warmFix getSales refs #6861	2024-07-05 10:47:26 +02:00
Alex Moreno	95a23ad9fc	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-06-25 11:43:42 +00:00
Jon Elias	61a588b57c	refactor: refs #6436 fixed test	2024-06-14 08:39:57 +02:00
Jon Elias	84a51d3e8d	feat: refs #6436 changed tests	2024-06-12 12:23:37 +02:00
Jon Elias	f0ad012835	refactor: refs #6436 first wave	2024-06-11 09:39:06 +02:00
Sergio De la torre	74b71079f2	refs #6861 feat: obsrevation	2024-05-27 11:33:04 +02:00
Sergio De la torre	2cd7133a8c	refs #6861 feat: skipTest	2024-05-27 08:15:57 +02:00
Javier Casado	03f0de489e	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-05-13 05:40:25 +00:00
Sergio De la torre	3a8dcbfd29	refs #6861 feat:reserve previos	2024-04-11 13:45:43 +02:00
Sergio De la torre	9a98c872d4	Merge branch '5890-itemShelving_asignado' into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-04-11 12:34:49 +02:00
Sergio De la torre	68fa64a937	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-04-11 12:24:00 +02:00
Carlos Andrés	5967bd545c	feat: previas con reserva refs #6861	2024-04-11 12:16:00 +02:00
Sergio De la torre	d998b650da	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-04-11 07:06:40 +02:00
Guillermo Bonet	743dc2144e	hotfix: refs #6276 Fix send chat msg getSales	2024-04-09 13:05:01 +02:00
Javier Segarra	8ab9063b50	refs #6436 feat: use mocks	2024-04-01 11:00:55 +02:00
Javier Segarra	48cc499f37	refs #6436 perf: example to use	2024-03-29 22:19:36 +01: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
Sergio De la torre	9eee26cbe9	refs #6276 feat:newWarehouse	2024-03-21 10:18:54 +01:00
Alex Moreno	0ad052c34a	refs #7033 deploy(2412): dev to test	2024-03-14 08:36:19 +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
Jorge Penadés	fc08adc064	fix: refs #6276 options	2024-03-05 10:09:32 +01:00