18650 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	980ca81bfc	refs #6353 fixtures catalog rating	2024-01-10 09:38:20 +01:00
Guillermo Bonet	2b0e5e9d04	Merge branch 'master' into 6582-routesMonitorTraduction	2024-01-10 08:20:39 +00:00
Carlos Satorres	877dc718a7	refs #6353 remove rating	2024-01-10 08:57:19 +01:00
Sergio De la torre	147dc2e5f1	Merge pull request '6275-hotFix-version_not_applied' (!1918) from 6275-hotFix-version_not_applied into master ... Reviewed-on: #1918 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-10 07:22:54 +00:00
Javier Segarra	21566fd7ba	refs #5499 code: remove unused translations	2024-01-10 07:50:29 +01:00
Javier Segarra	7cc454751e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5499_claim_rocketMessage_comercial	2024-01-10 07:48:11 +01:00
Javier Segarra	1bd6751d56	refs #5499 revert	2024-01-10 07:46:11 +01:00
Alex Moreno	d2f7b82ace	Merge branch 'master' into 6275-hotFix-version_not_applied	2024-01-10 06:39:40 +00:00
Carlos Satorres	6647649f5e	Merge pull request 'refs #6291 validateTin' (!1836) from 6291-comprobarDNI into dev ... Reviewed-on: #1836 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-09 14:03:17 +00:00
Guillermo Bonet	783436e8d2	fix: refs #6582 Traductions routesMonitor	2024-01-09 15:02:58 +01:00
Carlos Satorres	55f9519ebd	Merge branch 'dev' into 6291-comprobarDNI	2024-01-09 13:59:48 +00:00
Guillermo Bonet	510a395ef2	Merge pull request 'refactor: refs #6410 Deleted dmsType.path' (!1919) from 6410-dmsTypePath into dev ... Reviewed-on: #1919 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-01-09 13:53:16 +00:00
Carlos Satorres	16d7a20798	Merge branch 'dev' into 6291-comprobarDNI	2024-01-09 13:49:31 +00:00
Guillermo Bonet	08aaf660e2	Merge branch 'dev' into 6410-dmsTypePath	2024-01-09 13:33:01 +00:00
Guillermo Bonet	81ffc122fc	Merge branch 'test' into dev	2024-01-09 14:09:47 +01:00
Guillermo Bonet	9a82fbea05	Merge branch 'master' into test	2024-01-09 14:07:32 +01:00
Guillermo Bonet	5d4c106825	fix: refs #5848 Added flag DONT_EXPIRE_PASSWD	2024-01-09 13:59:11 +01:00
Carlos Satorres	bf44f82f4f	refs #6322 fix code	2024-01-09 13:16:14 +01:00
Carlos Satorres	676d95563b	refs #6322 importe	2024-01-09 12:53:58 +01:00
Robert Ferrús	ea5483e847	refs #6222 refactor: sale_calculateComponent	2024-01-09 10:50:37 +01:00
Guillermo Bonet	d5ca47ea2a	refactor: refs #6410 Deleted dmsType.path	2024-01-09 09:51:12 +01:00
Carlos Satorres	a22de3ab25	Merge branch 'dev' into 6291-comprobarDNI	2024-01-09 08:46:01 +00:00
Sergio De la torre	445703c6e2	6275-hotFix version not applied	2024-01-09 09:14:48 +01:00
Pablo Natek	dffb212722	Merge pull request 'refactor(ticketTracking.create): refs #6366 unify Ticket.state ticketTracking.create i vn.ticket_setState' (!1838) from 6366-unifyTicketChangeState into dev ... Reviewed-on: #1838 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-09 07:00:15 +00:00
Alex Moreno	3b38482221	Merge pull request 'refs #6067 fix(Mailer): await send email' (!1917) from 6067-mailer-await-email-send into master ... Reviewed-on: #1917 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-01-08 14:03:58 +00:00
Alex Moreno	4e823593b5	refs #6067 fix(Mailer): await send email	2024-01-08 14:35:01 +01:00
Pablo Natek	0e29db3b1e	Merge branch 'dev' into 6366-unifyTicketChangeState	2024-01-08 13:17:24 +00:00
Carlos Satorres	280f9080fa	Merge pull request 'refs #647 remove e2e' (!1915) from 6647-skipE2E into dev ... Reviewed-on: #1915 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-08 11:05:23 +00:00
Javier Segarra	f49b0276c7	Merge branch 'dev' into 6613_translations_in_back	2024-01-08 09:12:30 +00:00
Carlos Satorres	782772bffc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6291-comprobarDNI	2024-01-08 09:54:50 +01:00
Jorge Penadés	dd57627094	Merge pull request '6643-fixTicketStates' (!1914) from 6643-fixTicketStates into test ... Reviewed-on: #1914 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-01-08 08:35:17 +00:00
Pablo Natek	77d88df27d	Merge branch '6366-unifyTicketChangeState' of https://gitea.verdnatura.es/verdnatura/salix into 6366-unifyTicketChangeState	2024-01-08 09:13:02 +01:00
Pablo Natek	f4062ab47b	remove(traduction): refs #6366 remove unused traduction	2024-01-08 09:13:01 +01:00
Jorge Penadés	547ac44e9b	fix: refs #6643 fix user link	2024-01-08 09:11:44 +01:00
Pablo Natek	9af27783ed	Merge branch 'dev' into 6366-unifyTicketChangeState	2024-01-08 08:11:03 +00:00
Carlos Satorres	c72311860b	refs #647 remove e2e	2024-01-08 09:06:22 +01:00
Pablo Natek	cdea3abcdf	Merge pull request 'refs #6259 TicketSms to ClientSms' (!1900) from 6259-ticketSmsJoinClientSms into dev ... Reviewed-on: #1900 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-08 07:23:12 +00:00
Javi Gallego	406cf7335b	Merge branch 'dev' into 3979-abonarTicketsSinAlmacen	2024-01-05 07:12:12 +00:00
Pablo Natek	f48500f4b3	Merge branch 'dev' into 6366-unifyTicketChangeState	2024-01-04 18:44:11 +00:00
Pablo Natek	e9773b3885	refactor(state): refs #6366 simplify if condition	2024-01-04 18:56:31 +01:00
Javier Segarra	8ee6cfb015	refs #5499 feat: send RocketMessage when change state	2024-01-04 15:36:35 +01:00
Pablo Natek	2e5ae062cf	Merge branch 'dev' into 6259-ticketSmsJoinClientSms	2024-01-04 14:24:24 +00:00
Javier Segarra	71937a4df3	refs #5499 feat: send RocketMessage when change state	2024-01-04 15:17:16 +01:00
Javi Gallego	767c6a6ac8	test: refs #3979 fixtures arregladas para que los abonos sean negativos	2024-01-04 15:01:56 +01:00
Jorge Penadés	cdab389f22	Merge pull request 'using hasAnyNegative: refs #6515' (!1905) from 6515-hasAnyNegativeBase into dev ... Reviewed-on: #1905 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-01-04 13:56:44 +00:00
Carlos Satorres	37a13414d1	Merge pull request '6456-refactor-ticketState' (!1911) from 6456-refactor-ticketState into test ... Reviewed-on: #1911 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-04 12:14:11 +00:00
Carlos Satorres	282ae268fe	refs #6456 remove jasmine	2024-01-04 13:07:24 +01:00
Jorge Penadés	932b993723	Merge branch 'dev' into 6515-hasAnyNegativeBase	2024-01-04 11:45:38 +00:00
Alex Moreno	8019180ee8	Merge pull request '#5666 - Loggable to mixin' (!1826) from 5666-loggable_to_mixin into dev ... Reviewed-on: #1826 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-04 09:21:53 +00:00
Carlos Satorres	3b14c7cd23	refs #6456 fix tback, models	2024-01-04 09:51:04 +01:00