3086 Commits

Author	SHA1	Message	Date
Robert Ferrús	aa44d0e727	Merge branch 'dev' of https: refs #6702//gitea.verdnatura.es/verdnatura/salix into 6702-missageSaleCloned	2025-02-06 14:31:37 +01:00
Jon Elias	502b48718c	Merge pull request '#7965 - unifyProblems' (!2990) from 7965-unifyProblems into dev ... Reviewed-on: #2990 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-05 06:51:54 +00:00
Jon Elias	b3aaac2f52	Merge branch 'dev' into 7127-ModifyDaysToAddSales	2025-02-04 13:00:07 +00:00
Alex Moreno	fe7a1c60cc	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-04 13:03:17 +01:00
Robert Ferrús	14a48bf4c6	Merge branch 'dev' into 6702-missageSaleCloned	2025-02-03 12:37:12 +00:00
Robert Ferrús	d79c19d92a	feat: refs #6702 delete line	2025-02-03 12:42:38 +01:00
Robert Ferrús	0646d2e817	feat: refs #6702 changes request	2025-02-03 12:41:51 +01:00
Javi Gallego	55ec4aaba1	Merge pull request 'feat: refs #7686 Added new alertLevel ON_PREVIOUS and changes in vn.state.alertLevel' (!2890) from 7686-onPrevious into dev ... Reviewed-on: #2890 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-02-03 08:12:36 +00:00
Javi Gallego	adba4765ed	refactor: refs #7686 update alert level conditions to only check for 'FREE'	2025-02-03 09:07:08 +01:00
Robert Ferrús	d98476b777	Merge branch 'dev' into 6702-missageSaleCloned	2025-02-03 06:11:47 +00:00
Robert Ferrús	9d3a4257b7	feat: refs #6702 translations	2025-01-31 12:53:48 +01:00
Robert Ferrús	948bdbd2c6	feat: refs #6702 refs #6701 changes	2025-01-31 08:19:39 +01:00
Robert Ferrús	ce447b7de6	Merge branch 'dev' of https: refs #6702//gitea.verdnatura.es/verdnatura/salix into 6702-missageSaleCloned	2025-01-31 07:14:10 +01:00
Jose Antonio Tubau	ad29b26553	refactor: refs #7414 update Spanish translation for 'total' to 'importe'	2025-01-29 12:43:03 +01:00
Sergio De la torre	1575c509d1	fix: refs #7569 saveSign use lastState	2025-01-28 11:19:45 +01:00
Sergio De la torre	3f0f155113	fix: refs #7569 saveSign use lastState	2025-01-28 11:15:29 +01:00
Sergio De la torre	79ea19a360	fix: refs #7569 saveSign use lastState	2025-01-28 11:14:08 +01:00
Sergio De la torre	a29de13ab3	fix: refs #7569 saveSign use smtp.send and fix link	2025-01-28 09:54:26 +01:00
Javi Gallego	08d2414363	refactor: refs #7686 update editableStates tests to check for 'OK' and 'Bloqueado' states	2025-01-28 09:16:19 +01:00
Javi Gallego	0def25ad15	Merge branch 'dev' into 7686-onPrevious	2025-01-28 08:28:16 +01:00
Javier Segarra	198ae9a83b	Merge branch 'master' into Hotfix-PriceDifferenceShipped	2025-01-28 07:19:37 +00:00
Jon Elias	e85b68650d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into Fix-TicketSummaryAddress	2025-01-28 07:33:03 +01:00
Javi Gallego	857874c4c6	refactor: refs #7686 remove obsolete alert level updates and adjust state alert level logic	2025-01-27 15:43:26 +01:00
Jose Antonio Tubau	29af7cfcbc	test: refs #7322 added test error for case when expected error is not thrown	2025-01-27 08:23:30 +01:00
Jose Antonio Tubau	4fd58e24c5	Merge branch 'dev' into 7322-addSelectAddressOnTicketTransfer	2025-01-27 07:07:28 +00:00
Jon Elias	034df6e8ea	feat: added nickname in address	2025-01-24 13:48:35 +01:00
Jon Elias	6da004e7cf	fix: fixed shipped date when it is null	2025-01-24 09:29:58 +01:00
Jon Elias	603e3e32c4	fix: shipped field	2025-01-24 07:39:18 +01:00
Jose Antonio Tubau	95329b7ddb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7322-addSelectAddressOnTicketTransfer	2025-01-23 14:43:17 +01:00
Jose Antonio Tubau	f165d17869	feat: refs #7322 add addressFk parameter to transferClient method and update tests	2025-01-23 14:26:02 +01:00
Robert Ferrús	14e69c1c64	Merge branch 'dev' into 8398-mergeSendCheckingPresenceBack	2025-01-23 08:21:32 +00:00
Jon Elias	602e822599	refactor: refs #7184 deleted .value	2025-01-23 08:21:19 +01:00
Jon Elias	0eff155daf	refactor: refs #7184 created myteam filter and modified filters where it is used	2025-01-22 16:34:14 +01:00
Sergio De la torre	7f17cd59e7	Merge branch 'dev' of https: refs #7569//gitea.verdnatura.es/verdnatura/salix into 7569-sendEmailOrderTicket	2025-01-21 06:58:15 +01:00
Sergio De la torre	ef68884fe0	feat: refs #7569 refs#7569 sendEmailNotification	2025-01-20 16:27:35 +01:00
Sergio De la torre	b5e27707a7	feat: refs #7569 refs#7569 sendEmailNotification	2025-01-20 12:36:31 +01:00
Sergio De la torre	0340612645	feat: refs #7569 refs#7569 sendEmailNotification	2025-01-20 12:35:55 +01:00
Robert Ferrús	4853e45051	feat: refs #8398 change merge.spec	2025-01-16 07:29:40 +01:00
Jose Antonio Tubau	b78603275f	fix: refs #7322 reorder parameters in transferClient method for consistency	2025-01-15 14:13:00 +01:00
Jose Antonio Tubau	ec14281a82	feat: refs #7322 add optional addressFk parameter to transferClient method	2025-01-15 13:37:57 +01:00
Robert Ferrús	6ab0515f8e	feat: refs #8398 sendCheckingPresence	2025-01-15 12:31:28 +01:00
Carlos Andrés	948ad3a752	Merge branch 'dev' into 7965-unifyProblems	2025-01-15 10:16:25 +00:00
Jose Antonio Tubau	1cd7eda4ac	Merge pull request 'feat: refs #8117 add worker first and last name to item type query' (!3330) from 8117-filtersAndValuesReviewed into dev ... Reviewed-on: #3330 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-13 06:13:31 +00:00
Guillermo Bonet	886383b82d	Merge branch 'dev' into 7686-onPrevious	2025-01-10 10:01:40 +01:00
Sergio De la torre	a1e1d4fa72	fix: refs #7569 refs·6861 ticketOrderReserve	2025-01-10 07:20:24 +01:00
Sergio De la torre	12fa87a93c	fix: refs #7569 refs·6861 ticketOrderReserve	2025-01-09 16:15:29 +01:00
Carlos Andrés	71fcce4ed7	Merge branch 'dev' into 7965-unifyProblems	2025-01-09 08:13:42 +01:00
Alex Moreno	cfe886b687	Merge branch 'dev' into 8117-filtersAndValuesReviewed	2025-01-03 06:52:04 +00:00
Sergio De la torre	05b8c3451a	Merge branch 'dev' of https: refs #7569//gitea.verdnatura.es/verdnatura/salix into 7569-sendEmailOrderTicket	2025-01-02 10:47:11 +01:00
Robert Ferrús	eca2ff84ef	feat: refs #6702 changes	2025-01-02 07:49:49 +01:00