23354 Commits

All Branches

Search

Author	SHA1	Message	Date
Pablo Natek	3b529440ba	fix: refs #7752 refactor insert	2024-07-18 15:16:25 +02:00
Pablo Natek	684983ee42	fix: refs #7752 add new state after scan	2024-07-18 15:14:18 +02:00
Robert Ferrús	b9e9d9aad3	Merge branch 'dev' into 7683-productionControlDeadlock	2024-07-18 12:55:09 +00:00
Ivan Mas	6d1663617f	Merge branch 'dev' into 7393-Night_tcket_closing_report	2024-07-18 12:51:34 +00:00
Ivan Mas	03227d5e51	refs #7393 do the translations	2024-07-18 14:49:40 +02:00
Guillermo Bonet	f687994a7f	refactor: refs #7681 Requested changes	2024-07-18 14:27:10 +02:00
Alex Moreno	41ed73cb28	Merge pull request '6943-fixCustomer' (!2754) from 6943-fixCustomer into dev ... Reviewed-on: #2754 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-07-18 12:01:07 +00:00
Alex Moreno	c30362a266	Merge branch 'dev' into 6943-fixCustomer	2024-07-18 11:58:18 +00:00
Guillermo Bonet	f18b165e4a	Merge branch 'master' into test	2024-07-18 13:45:23 +02:00
Guillermo Bonet	ba5c44994d	feat: refs #7686 Added cascade on update vn.state.alertLevel	2024-07-18 13:45:06 +02:00
Sergio De la torre	bd10741311	hotFix reservas refs #6861	2024-07-18 12:42:00 +02:00
Robert Ferrús	ff8820f18d	Merge branch 'dev' into 7683-productionControlDeadlock	2024-07-18 10:08:15 +00:00
Jon Elias	dc9d252a8a	Merge pull request '#7356 New parameters for Weekly tickets' (!2757) from 7356_TicketMigration_End_Back into dev ... Reviewed-on: #2757 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-07-18 10:07:53 +00:00
Robert Ferrús	57efba8601	Merge branch '7683-productionControlDeadlock' of https://gitea.verdnatura.es/verdnatura/salix into 7683-productionControlDeadlock	2024-07-18 12:04:19 +02:00
Robert Ferrús	15adc59ec5	feat: refs #7683 drop temporary table	2024-07-18 12:04:17 +02:00
Robert Ferrús	e878615983	Merge branch 'dev' into 7683-productionControlDeadlock	2024-07-18 09:53:38 +00:00
Robert Ferrús	c17214ce05	feat: refs #7683 drop temporary table	2024-07-18 11:50:01 +02:00
Jon Elias	719303b511	Merge branch 'dev' into 7356_TicketMigration_End_Back	2024-07-18 08:53:52 +00:00
Jon Elias	150b3a276e	feat: refs #7356 new parameters in sql for Weekly tickets front	2024-07-18 10:51:24 +02:00
Pablo Natek	1bb20b1bc3	Merge pull request 'feat: refs #6403 add address mobile' (!2756) from 6403-addAddressMobile into master ... Reviewed-on: #2756 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-18 08:17:06 +00:00
Pablo Natek	409daaf584	feat: refs #6403 add address mobile	2024-07-18 10:13:21 +02:00
Alex Moreno	9d4e976e5a	Merge pull request 'fix: refs #7039 country order' (!2755) from 7039-hotFixOrderCountry into master ... Reviewed-on: #2755 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-18 07:30:58 +00:00
Robert Ferrús	e96fa75356	fix: refs #7039 country order	2024-07-18 09:22:27 +02:00
Alex Moreno	e66d138091	feat(defaulter_filter): add department	2024-07-18 08:12:39 +02:00
Alex Moreno	12316fb44b	fix(client_filter): add recovery	2024-07-18 07:32:42 +02:00
Sergio De la torre	fa07d03b8c	Merge pull request 'master' (!2753) from master into test ... Reviewed-on: #2753 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-07-18 05:05:01 +00:00
Carlos Andrés	b6761d3dc0	fix: refs#7748 solicitud de domiciliación bancaria	2024-07-17 19:08:01 +02:00
Carlos Andrés	87f9c93ca7	Merge pull request 'Hotfix itemShelvingSale_doReserve Ticket #204044' (!2751) from Hotfix--itemShelvingSale_doReserve into master ... Reviewed-on: #2751 Reviewed-by: Ivan Mas <ivanm@verdnatura.es>	2024-07-17 16:28:14 +00:00
Carlos Andrés	f7429f3927	Hotfix itemShelvingSale_doReserve Ticket #204044	2024-07-17 18:24:27 +02:00
Sergio De la torre	0181764744	Merge pull request 'master' (!2750) from master into test ... Reviewed-on: #2750 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-17 15:09:35 +00:00
Sergio De la torre	15c5fefc92	Merge pull request '6861_reservas_hotFix' (!2749) from 6861_reservas_hotFix into master ... Reviewed-on: #2749 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-17 15:05:18 +00:00
Sergio De la torre	a35ec4a42c	hotFix reservas refs #6861	2024-07-17 16:48:52 +02:00
Sergio De la torre	a54456ac7d	Merge branch '6861_reservas_hotFix' of https://gitea.verdnatura.es/verdnatura/salix into 6861_reservas_hotFix	2024-07-17 16:21:38 +02:00
Sergio De la torre	8ff3e8acb0	hotFix reservas refs #6861	2024-07-17 16:21:37 +02:00
Sergio De la torre	5130b4ebdd	Merge branch '6861_reservas_hotFix' of https://gitea.verdnatura.es/verdnatura/salix into 6861_reservas_hotFix	2024-07-17 16:18:00 +02:00
Sergio De la torre	2e313b47b1	Merge branch '6861_reservas_hotFix' of https://gitea.verdnatura.es/verdnatura/salix into 6861_reservas_hotFix	2024-07-17 16:14:31 +02:00
Sergio De la torre	3aea6fdd46	hotFix reservas refs #6861	2024-07-17 16:13:31 +02:00
Sergio De la torre	7047578809	hotFix reservas refs #686	2024-07-17 16:09:09 +02:00
Pablo Natek	075f2b7ba4	Merge pull request 'feat: refs #7297 add new columns' (!2740) from 7297-itemAddTags10-13 into dev ... Reviewed-on: #2740 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-17 12:58:40 +00:00
Alex Moreno	a1f481deb1	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-07-17 14:17:17 +02:00
Ivan Mas	019e29f3dd	Merge branch 'dev' into 7393-Night_tcket_closing_report	2024-07-17 11:48:57 +00:00
Alex Moreno	2763839c54	hotFix(workerTimeControl): confirm correct url	2024-07-17 13:42:23 +02:00
Alex Moreno	d52a229613	hotFix(workerTimeControl): confirm correct url	2024-07-17 13:40:57 +02:00
Alex Moreno	021d315a01	fix: weeklyHourRecordEmail workerId prop and correct request in frontend	2024-07-17 13:30:47 +02:00
Alex Moreno	ae2ddcb8c7	add console.log	2024-07-17 12:20:58 +02:00
Alex Moreno	e5bfb4af23	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-07-17 12:20:22 +02:00
Alex Moreno	563c70c65d	fix(cancelShipment): fix	2024-07-17 11:18:12 +02:00
Alex Moreno	4ff388198b	fix(deletExpeditions): add try catch	2024-07-17 10:14:41 +02:00
Pablo Natek	b5728b43f0	Merge pull request 'feat: refs #6403 add cancelShipment on deleteExpeditions' (!2747) from 6403-featDeleteMrw into master ... Reviewed-on: #2747 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-17 06:25:32 +00:00
Pablo Natek	f83dd37a28	fix: refs #6403 remove line	2024-07-17 08:23:33 +02:00