19715 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Javier Segarra	f7d83b15bd	Merge branch 'dev' into 5666-loggable_to_mixin	2024-01-04 08:08:46 +00:00
Carlos Satorres	15d6c9a65b	Merge branch '6456-refactor-ticketState' of https://gitea.verdnatura.es/verdnatura/salix into 6456-refactor-ticketState	2024-01-04 08:39:07 +01:00
Javi Gallego	4cb82524cb	test: refs #3979 quito clone parametro group porque no se usa	2024-01-04 08:37:34 +01:00
Alex Moreno	2a65ad6b31	refs #6635 build: new version	2024-01-04 08:22:01 +01:00
Alex Moreno	23b544c1ec	refs #6635 fix: add translation	2024-01-04 08:19:48 +01:00
Alex Moreno	f93416e8c1	Merge pull request '#5914 - hotFix-transferInvoice' (!1893) from 5914-hotFix-transferInvoice into test ... Reviewed-on: #1893 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-01-04 07:12:57 +00:00
Pablo Natek	847623f9c6	Merge branch 'dev' into 6259-ticketSmsJoinClientSms	2024-01-03 18:28:46 +00:00
Pablo Natek	b42aed13c4	Merge branch 'dev' into 6366-unifyTicketChangeState	2024-01-03 18:15:29 +00:00
Javi Gallego	2fb60aeed3	Merge branch 'dev' into 3979-abonarTicketsSinAlmacen	2024-01-03 15:37:05 +01:00
Javi Gallego	ab341b9b5e	test: refs #3979 test de clone	2024-01-03 15:36:39 +01:00
Alex Moreno	227afbe39d	refs #5914 fix(invoiceOut_descriptorMenu): transalation	2024-01-03 14:54:01 +01:00
Alex Moreno	af784522c1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice	2024-01-03 14:52:16 +01:00
Javier Segarra	4d7f0329ee	Merge branch 'dev' into 5666-loggable_to_mixin	2024-01-03 12:46:26 +00:00
Carlos Satorres	3fbead7473	refs #6291 fix tinIsValid	2024-01-03 13:44:20 +01:00
David Domenech	3c1237f727	refs #6456	2024-01-03 13:37:18 +01:00
David Domenech	d29fd5c65a	refs #6456	2024-01-03 13:35:36 +01:00
Guillermo Bonet	a6ebd01ebd	Merge branch 'test' into dev	2024-01-03 13:28:23 +01:00
Jorge Penadés	1f77559519	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated	2024-01-03 12:53:12 +01:00
Jorge Penadés	6986ec1f8a	Merge pull request '#6274 workerTimeControl' (!1858) from 6274-loginWorkerTimeControl into dev ... Reviewed-on: #1858 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-01-03 11:31:48 +00:00
Alex Moreno	ba26237998	refs #5914 refactor: getTaxBases	2024-01-03 12:19:28 +01:00
Guillermo Bonet	f73a447391	refs #6398 Hotfix 1/2	2024-01-03 11:57:49 +01:00
Jorge Penadés	4e951263c9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated	2024-01-03 11:55:37 +01:00
Javier Segarra	2c91b5b701	refs #5878 perf: change require file	2024-01-03 11:53:00 +01:00
Jorge Penadés	5dc49d226a	refs #6274 fix locale	2024-01-03 10:13:56 +01:00
Alex Moreno	121caee93a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice	2024-01-03 09:53:52 +01:00
Javier Segarra	a9e022bd57	Merge branch 'dev' into 6613_translations_in_back	2024-01-03 08:19:31 +00:00
Jorge Penadés	23854cb103	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6515-hasAnyNegativeBase	2024-01-03 09:02:52 +01:00
Jorge Penadés	b086da1936	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2024-01-03 08:57:46 +01:00
Carlos Satorres	b70e2fc1a4	Merge pull request 'refs #6085 aclMail back' (!1869) from 6085-ACLsMail into dev ... Reviewed-on: #1869 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-03 07:56:07 +00:00
Alex Moreno	b7c53507f8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2024-01-03 08:38:28 +01:00
Alex Moreno	399ca694ab	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-01-03 08:38:01 +01:00
Alex Moreno	f607719efe	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2024-01-03 08:34:00 +01:00
Carlos Satorres	12165ab382	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail	2024-01-03 08:31:07 +01:00