8582 Commits

Author	SHA1	Message	Date
Carlos Satorres	d1a3c67d2e	refs #6667 fix limit	2024-01-17 14:07:04 +01:00
Carlos Satorres	1458a803bd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6296-countryAddress	2024-01-17 13:49:05 +01:00
Guillermo Bonet	45fd96cee6	feat: #6184 Modified uploadFile	2024-01-17 13:07:26 +01:00
Jorge Penadés	1fbb84ae9f	fix: refs #6276 itemShelving_return	2024-01-17 12:58:57 +01:00
Jorge Penadés	bf13e85ecc	fix: refs #6276 getFromSectorCollection	2024-01-17 12:14:38 +01:00
Jorge Penadés	e69ec2c856	feat: refs #6276 test expeditionPallet_get	2024-01-17 12:07:22 +01:00
Javier Segarra	3564a77043	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6174_refactor_invoicePdfNotify	2024-01-17 11:12:04 +01:00
Guillermo Bonet	f1b84ee7a0	Merge branch 'dev' into 6184-saveCmr	2024-01-17 10:44:00 +01:00
Javier Segarra	21ce57d217	refs #6174 feat: update back to separate invoice and pdf	2024-01-17 10:31:07 +01:00
Jorge Penadés	90b1e8d664	fix: refs #6276 backend tests	2024-01-17 10:18:13 +01:00
Carlos Satorres	d47429b4a7	refs #6667 sql	2024-01-17 10:01:38 +01:00
Guillermo Bonet	2f67056dbf	Merge branch 'test' into dev	2024-01-17 09:44:32 +01:00
Jorge Penadés	6a78123fca	fix: refs #6276 machineWorke_update	2024-01-17 09:01:48 +01:00
Jorge Penadés	07e9b737c5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-17 07:50:21 +01:00
Jorge Penadés	4f7240b496	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-16 14:50:55 +01:00
Jorge Penadés	fafc25ed19	refactor: refs #6276 sectorCollection_getSale	2024-01-16 14:50:09 +01:00
Alex Moreno	aac3e17d3c	Merge branch 'test' into 6222-test-saleCcomponentUpdate	2024-01-16 13:40:37 +00:00
Alex Moreno	9452aacb49	Merge branch 'dev' into 6230-basicItem	2024-01-16 13:25:28 +00:00
Guillermo Bonet	5bbeda4014	feat: refs #4734 Added viaexpress interdia	2024-01-16 13:05:16 +01:00
Carlos Satorres	7b9480f006	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE	2024-01-16 12:48:13 +01:00
Carlos Satorres	3ebeebc159	refs #6230 remove basic-data columns	2024-01-16 11:47:45 +01:00
Carlos Satorres	b3e1c58918	refs #6313 remove restriction	2024-01-15 14:50:08 +01:00
Jorge Penadés	54192c54ad	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-15 13:56:32 +01:00
Carlos Satorres	55b5e4cfcd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6296-countryAddress	2024-01-15 13:29:39 +01:00
Javier Segarra	831d358e41	refs #6174 feat first approach	2024-01-15 10:52:02 +01:00
Guillermo Bonet	107e35001a	fix: refs #6582 Solved log error	2024-01-15 10:09:43 +01:00
Carlos Satorres	107dded411	refs #6296 countryAddress	2024-01-15 09:03:56 +01:00
Jorge Penadés	fcca927adb	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-ticketRefund	2024-01-15 07:54:35 +01:00
Alex Moreno	c20b9fe212	refs #6656 fix(updateTimeEntry): correct accessType (WRITE)	2024-01-15 07:45:40 +01:00
Jorge Penadés	6236cf0621	hotfix ticketRefund	2024-01-12 16:18:26 +01:00
Alex Moreno	199656afb8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-01-12 12:41:52 +01:00
Jorge Penadés	2a6b509a78	fix: refs #6656 change acls	2024-01-12 09:54:18 +01:00
Alex Moreno	14fff571b5	Merge branch 'dev' into 6353-ratingCatalog	2024-01-12 08:52:51 +00:00
Carlos Satorres	d0df880c32	Merge branch 'dev' into 6322-futureTicketImporte	2024-01-12 07:47:23 +00:00
Jorge Penadés	ddcecb8f22	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-11 16:52:54 +01:00
Alex Moreno	b1530d049e	refs #6398 hotFix: use userFk	2024-01-11 13:29:03 +01:00
Javi Gallego	c98baf21bf	Merge branch 'dev' into 3979-abonarTicketsSinAlmacen	2024-01-11 12:17:59 +00:00
Juan Ferrer	ce5e8c278f	Merge branch 'dev' into 6660-mariadbV10.11.6	2024-01-11 11:22:55 +00:00
Jorge Penadés	c61f5a67b6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-11 09:28:24 +01:00
Alex Moreno	a92297da73	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-01-11 08:14:56 +01:00
Javier Segarra	b76e269e73	refs #5499 perf: rename variable	2024-01-11 06:18:02 +00:00
Alex Moreno	edde5819e3	refs #6660 feat: update mariadb version 10.7.7→10.11.6	2024-01-10 15:39:35 +01:00
Javier Segarra	de4ddf9392	remove bad comment	2024-01-10 13:47:42 +00:00
Pablo Natek	a623e5b90e	Merge branch '6398-ticketTrackingAsignFix' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTrackingAsignFix	2024-01-10 13:55:03 +01:00
Pablo Natek	dff277ed12	fix(spec): refs #6398 fix spec	2024-01-10 13:55:01 +01:00
Pablo Natek	5d63b4fba8	Merge branch 'master' into 6398-ticketTrackingAsignFix	2024-01-10 12:51:33 +00:00
Pablo Natek	63b20c1e91	fix(ticketTracking): refs #6398 assign ticket workerFk to userFk	2024-01-10 13:12:12 +01:00
Carlos Satorres	980ca81bfc	refs #6353 fixtures catalog rating	2024-01-10 09:38:20 +01:00
Carlos Satorres	877dc718a7	refs #6353 remove rating	2024-01-10 08:57:19 +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
Guillermo Bonet	783436e8d2	fix: refs #6582 Traductions routesMonitor	2024-01-09 15:02:58 +01:00
Carlos Satorres	16d7a20798	Merge branch 'dev' into 6291-comprobarDNI	2024-01-09 13:49:31 +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
Carlos Satorres	a22de3ab25	Merge branch 'dev' into 6291-comprobarDNI	2024-01-09 08:46:01 +00:00
Jorge Penadés	ab1dc7af55	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-08 16:21:46 +01:00
Pablo Natek	0e29db3b1e	Merge branch 'dev' into 6366-unifyTicketChangeState	2024-01-08 13:17:24 +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	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
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
Jorge Penadés	8a5da43503	refactor: sectorCollection_getSale refs #6276	2024-01-04 16:00:25 +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
Jorge Penadés	7a64b57a2a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-04 15:07:33 +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	ad89363db5	fix: mark refs #6276	2024-01-04 13:11:39 +01:00
Jorge Penadés	2eca02d74f	refactor: drop getItemPackingType refs #6276	2024-01-04 12:57:46 +01:00
Jorge Penadés	932b993723	Merge branch 'dev' into 6515-hasAnyNegativeBase	2024-01-04 11:45:38 +00:00
Jorge Penadés	3ebf0a30a9	refactor: drop getItemPackingType refs #6276	2024-01-04 12:44:44 +01:00
Jorge Penadés	da8057e4c7	fix: updateTracking refs #6276	2024-01-04 12:35:00 +01:00
Jorge Penadés	384d9ec803	fix: updateTracking refs #6276	2024-01-04 12:27:02 +01:00
Javier Segarra	f7d83b15bd	Merge branch 'dev' into 5666-loggable_to_mixin	2024-01-04 08:08:46 +00:00
Jorge Penadés	7d0c11e937	Merge branch '6276-createNewWarehouse' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-04 08:51:46 +01:00
Jorge Penadés	6d0e1cc47c	refactor: fix conficts refs #6276	2024-01-04 08:51:18 +01: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	23b544c1ec	refs #6635 fix: add translation	2024-01-04 08:19:48 +01: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
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
Sergio De la torre	0b5ffcc81c	refs #6276:modify back silex→salix	2024-01-03 12:50:53 +01: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
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
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
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
Pablo Natek	c116bc56c3	refactor(clientSms): refs #6259 redirect to lilium	2024-01-02 19:37:51 +01:00
Jorge Penadés	31c282ac0b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6515-hasAnyNegativeBase	2024-01-02 14:50:26 +01:00
Guillermo Bonet	176cbe1537	Merge branch 'dev' into 6433-sectorRefactor	2024-01-02 13:02:16 +00:00
Alex Moreno	1e3a7e5f91	refs #5914 refactor: invoiceTickets	2024-01-02 13:17:10 +01:00
Javier Segarra	295124e0af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2687_travel_cloneWithEntries	2024-01-02 12:59:50 +01:00
Jorge Penadés	924fe12a93	add root: refs #6276	2024-01-02 12:44:12 +01:00
Sergio De la torre	365e05d560	refs #6276:mdify back silex→salix	2024-01-02 12:21:25 +01:00
Guillermo Bonet	7cfcb17aff	Merge branch 'dev' into 6433-sectorRefactor	2024-01-02 10:50:00 +00:00
Jorge Penadés	6b8a4a512b	adding filter: refs #6606	2024-01-02 10:42:50 +01:00
Javier Segarra	4510f0a037	Merge branch 'dev' into 5666-loggable_to_mixin	2024-01-02 09:26:18 +00:00
Jorge Penadés	68ef193a19	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-02 09:58:30 +01:00
Jorge Penadés	3bd14095fb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6369-fixGetNegativeBasesInvoices	2024-01-02 09:45:44 +01:00
Jorge Penadés	767894b128	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-02 09:41:47 +01:00
Jorge Penadés	763af7da2d	fix test: refs #6274	2024-01-02 08:58:41 +01:00
Alex Moreno	dd02a932ef	Merge branch 'test' into 5914-hotFix-transferInvoice	2024-01-02 06:40:18 +00:00
Jorge Penadés	15ec91ec79	fix query: refs #6369	2023-12-29 14:05:01 +01:00
Pablo Natek	ccf5387e04	refactor(state): refs #6366 unifyTicketChangeState	2023-12-29 12:44:24 +01:00
Jorge Penadés	1b8461034e	using hasAnyNegative: refs #6515	2023-12-29 12:40:48 +01:00
Pablo Natek	f7ec64f3c1	merge(dev): refs #6366 merge dev	2023-12-28 16:00:23 +01:00
Jorge Penadés	567879d64e	corrective back created: refs #4466	2023-12-28 15:55:11 +01:00
Carlos Satorres	bfb31ad7c3	refs #5525 supplier	2023-12-28 11:46:34 +01:00
Carlos Satorres	c77715d865	refs #6291 validation original	2023-12-26 15:03:10 +01:00
Jorge Penadés	a89d1e883a	create rectification: refs #4466	2023-12-26 14:36:58 +01:00
Pablo Natek	5a1c4ddea0	refactor(ticketSms): refs #6259 ticketSmsToClientSms	2023-12-26 08:20:13 +01:00
Jorge Penadés	86db5a931d	arrange test suites: refs #6274	2023-12-22 10:44:21 +01:00
Pablo Natek	35750bc93f	merge(dev): refs #6259 merge dev	2023-12-21 18:46:12 +01:00
Pablo Natek	27a369bef4	refactor(ticketSms): refs #6259 merge ticksms to clientsms	2023-12-21 18:34:22 +01:00
Carlos Satorres	c4ff4c1984	refs #6291 tin valid	2023-12-21 15:07:03 +01:00
Jorge Penadés	0998b5bf2c	add locale and refactor: refs #6274	2023-12-21 13:58:33 +01:00
Javier Segarra	6b37f23349	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin	2023-12-21 13:06:52 +01:00
Carlos Satorres	73d1c1698b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6291-comprobarDNI	2023-12-21 12:38:58 +01:00
Guillermo Bonet	0f20f95dc5	refactor: refs #6433 Deleted isPreviousPrepared* columns in model	2023-12-21 10:08:17 +01:00
Jorge Penadés	f5cc2cd75b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-12-21 08:38:33 +01:00
Alex Moreno	7b65ebb58b	Merge branch 'dev' into 5854-itemShelvingTraduciones	2023-12-21 06:50:45 +00:00
Javier Segarra	adc7608b25	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5499_claim_rocketMessage_comercial	2023-12-20 14:40:42 +01:00
Javier Segarra	5c5be788c1	refs #5499 feat: trigger for all changes	2023-12-20 14:08:11 +01:00
Guillermo Bonet	5f83fc158c	Merge branch 'dev' into 6582-routesMonitorTraduction	2023-12-20 13:03:57 +00:00
Jorge Penadés	5d75592627	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-12-20 12:19:10 +01:00
Javier Segarra	acb0ec508f	refs #5499 feat: claimObservation	2023-12-20 12:09:01 +01:00
Javier Segarra	01e6e7dc39	Merge branch 'dev' into 6172_transfer_ticket_message_error	2023-12-20 11:02:00 +00:00
Juan Ferrer	10bfafdd3c	Merge branch 'dev' into 6264-renewToken	2023-12-20 09:05:53 +00:00
Alex Moreno	351a12204a	Merge branch 'dev' into 6172_transfer_ticket_message_error	2023-12-20 08:07:30 +00:00
Guillermo Bonet	753c6e9ec5	feat: refs #6582 Added traductions	2023-12-20 07:28:54 +01:00
Guillermo Bonet	516a3760a1	feat: refs #6582 Added traductions	2023-12-20 07:27:13 +01:00
Alex Moreno	7777696cf7	refs #6589 fix(worker_absences): fix started hours	2023-12-19 13:58:08 +01:00
Guillermo Bonet	17e177b788	fix: refs #6398 Fix tests back	2023-12-19 10:12:03 +01:00
David Domenech	d60f2a7f88	fix: refs #6398 Changed alias of views	2023-12-19 09:43:09 +01:00
Carlos Satorres	e4de704b4c	Merge branch 'dev' into 6220-addressFilter	2023-12-18 11:16:58 +00:00
Jorge Penadés	5c22f51043	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-12-18 10:29:14 +01:00
Javier Segarra	7723b244d0	Merge branch 'dev' into 6172_transfer_ticket_message_error	2023-12-18 07:17:51 +00:00
Javier Segarra	8d650cf6c0	refs #6172 test: remove message code	2023-12-18 08:09:44 +01:00
Javier Segarra	29a7d9b941	Merge branch '2051_dms_methods_refactor' of https://gitea.verdnatura.es/verdnatura/salix into 2051_dms_methods_refactor	2023-12-15 13:01:47 +01:00
Javier Segarra	dc98436b85	refs #2051 perf: rename variable	2023-12-15 13:01:44 +01:00
Javier Segarra	c9af8cba81	refs #5878 feat: remove . for this message	2023-12-15 12:50:05 +01:00
Jorge Penadés	d70a3570d3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-12-15 12:18:28 +01:00
Javier Segarra	98a98e0d9e	refs #2687 perf: remove force test	2023-12-15 07:40:31 +01:00
Javi Gallego	3a37e6dfc8	Merge branch 'dev' into 3979-abonarTicketsSinAlmacen	2023-12-15 07:37:29 +01:00
Javier Segarra	f10cada19f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2687_travel_cloneWithEntries	2023-12-15 07:35:04 +01:00
Javier Segarra	b5b58faee4	refs #2687 perf: remove comments	2023-12-15 07:34:37 +01:00
Javier Segarra	d9ffdaf855	refs #2687 test: use tx.rollback()	2023-12-14 16:00:29 +01:00
Alex Moreno	21a1dbeae7	refs #5914 fix: ticket canBeInvoiced and optimized invoiceTickets	2023-12-14 15:56:49 +01:00
Carlos Satorres	fe184156a1	Merge branch 'dev' into 6220-addressFilter	2023-12-14 13:51:09 +00:00
Carlos Satorres	f73f3813b3	Merge branch '6220-addressFilter' of https://gitea.verdnatura.es/verdnatura/salix into 6220-addressFilter	2023-12-14 14:37:22 +01:00
Carlos Satorres	bbb9f58a9e	refs #6220 fix(client_filter): fix where	2023-12-14 14:37:14 +01:00
Javier Segarra	043c411f68	Merge branch 'dev' into 2051_dms_methods_refactor	2023-12-14 11:41:11 +00:00
Javier Segarra	9316c31180	refs #6264 perf: rename variable when destroy ids	2023-12-14 12:36:36 +01:00
Javier Segarra	1939c65fab	refs #6264 test: remove force describe for dms test	2023-12-14 12:35:54 +01:00
Javier Segarra	d0af29c0c5	refs #6264 test: remove force describe for dms test	2023-12-14 12:28:41 +01:00
Javier Segarra	dddc749744	Merge branch 'dev' into 6264-renewToken	2023-12-14 11:05:00 +00:00
Javi Gallego	26a05a4840	fix: refs #3979 si se abona un abono sin almacen no falla	2023-12-14 09:14:21 +01:00
Alex Moreno	e7911738c6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-12-14 08:50:20 +01:00
Jorge Penadés	1f2d475f05	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-12-14 08:41:45 +01:00
Javier Segarra	397eb4d32b	Merge branch 'dev' into 2051_dms_methods_refactor	2023-12-14 06:22:22 +00:00
Javier Segarra	485968037b	Merge branch 'dev' into 6264-renewToken	2023-12-14 06:22:17 +00:00
Sergio De la torre	af83519ee6	Merge branch 'dev' into 6275-silex-to-salix	2023-12-13 15:12:39 +00:00
Jorge Penadés	36a9b0eee4	refs #6276 collectionAddItem	2023-12-13 16:00:07 +01:00
Javier Segarra	1e89ed6cdc	Merge branch 'dev' into 6264-renewToken	2023-12-13 14:39:10 +00:00
Javier Segarra	06bae44824	refs #2051 perf: uploadFile after review	2023-12-13 15:38:46 +01:00
Carlos Satorres	9a5536a3a3	Merge branch 'dev' into 6220-addressFilter	2023-12-13 14:05:51 +00:00
Carlos Satorres	cfa08963fb	Merge branch '6220-addressFilter' of https://gitea.verdnatura.es/verdnatura/salix into 6220-addressFilter	2023-12-13 15:05:43 +01:00
Carlos Satorres	40499e44cf	refs #6220 remove concat	2023-12-13 15:05:41 +01:00
Robert Ferrús	4df2fa8ee4	Merge branch 'dev' into 5854-itemShelvingTraduciones	2023-12-13 13:30:53 +00:00
Robert Ferrús	b9efbc7d44	refs #5854	2023-12-13 14:30:29 +01:00
Javier Segarra	7b9e3b0985	refs #2051 perf: removeFile after review	2023-12-13 14:24:05 +01:00
Carlos Satorres	6416891918	refs #6291 tinIsValid worker	2023-12-13 13:55:31 +01:00
Javier Segarra	7bdb1b2078	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2051_dms_methods_refactor	2023-12-13 13:49:38 +01:00
Javier Segarra	a5ecec9603	refs #2051 feat: remove front methods refactor	2023-12-13 13:47:30 +01:00
David Domenech	9bcd0a3c98	Merge branch 'dev' into 6125-roleCreditLimitFix	2023-12-13 11:29:46 +00:00
Jorge Penadés	8d61473d4f	refs #6276 fixtures & itemBarcode_delete	2023-12-13 11:43:19 +01:00
Jorge Penadés	a4c3d78e31	refs #6276 drop fixtures & fix getSale	2023-12-13 09:45:01 +01:00
David Domenech	ee6ad55e66	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTracking-change-workerFk-to-userFk	2023-12-13 09:43:20 +01:00
Jorge Penadés	64c10f3b8e	refs #6276 sectorCollection_getSales	2023-12-13 08:52:43 +01:00
Pablo Natek	f63b26b71f	Merge branch 'dev' into 6125-roleCreditLimitFix	2023-12-13 07:52:36 +00:00
Carlos Satorres	371a202230	Merge branch 'dev' into 6220-addressFilter	2023-12-13 07:51:23 +00:00
Pablo Natek	69dd34665f	refactor(renameTable): refs #6125 clientCreditLimit to roleCreditLimit	2023-12-13 08:50:17 +01:00
Jorge Penadés	01fa0b1d36	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-12-13 08:35:11 +01:00
Javier Segarra	074bb2b980	Merge branch 'dev' into 5666-loggable_to_mixin	2023-12-13 06:30:14 +00:00
Sergio De la torre	435819cf3c	refs #6275 feat:Silex_to_Salix test getExpeditionSummary	2023-12-13 07:24:13 +01:00
Javier Segarra	d44cdcbd13	Merge branch 'dev' into 6264-renewToken	2023-12-13 06:14:55 +00:00
Robert Ferrús	5f4adab017	refs #5854	2023-12-12 18:03:09 +01:00
Jorge Penadés	9e6fac9add	refs #6276 change to boolean	2023-12-12 16:00:43 +01:00
Sergio De la torre	e22201c840	Merge branch 'dev' into 6275-silex-to-salix	2023-12-12 14:50:25 +00:00
Javier Segarra	d206c93305	refs #2051 feat: getAllowedContentTypes approach	2023-12-12 15:03:00 +01:00
Jorge Penadés	7b81630b85	refs #6276 shelvingLog_add	2023-12-12 14:56:58 +01:00
Javier Segarra	6b70f8b3eb	refs #2051 feat: uploadFile approach	2023-12-12 13:49:14 +01:00
Jorge Penadés	f5ee3aff7a	refs #6276 remove checking visible	2023-12-12 13:43:15 +01:00
Jorge Penadés	3109f7722e	refs #6276 saleTracking_mark	2023-12-12 13:24:18 +01:00
Carlos Satorres	78aa25d74f	refs #6220 fix testback	2023-12-12 13:21:08 +01:00
Carlos Satorres	6cefc982e4	refs #6220 add filter address	2023-12-12 13:14:41 +01:00
Javier Segarra	ae76776245	refs #2051 feat: removeFile approach	2023-12-12 12:09:06 +01:00
Javier Segarra	8bd9becb74	refs #2687 feat: remove procedure argument	2023-12-12 07:34:20 +01:00
Javier Segarra	30dbc8a587	refs #2687 feat: fix test suite	2023-12-12 07:33:08 +01:00
Robert Ferrús	9894591aa9	Merge branch 'dev' into 5854-itemShelvingTraduciones	2023-12-11 17:56:40 +00:00
Javier Segarra	c0d2e0511d	refs #2687 feat: modify back method	2023-12-11 14:54:12 +01:00
Carlos Satorres	7e6f311a43	refs #6220 address filter	2023-12-11 14:51:11 +01:00
Carlos Satorres	c81ca94d2e	refs #6220 add filter address	2023-12-11 14:44:33 +01:00
Jorge Penadés	84270587cb	refs #6274 refactor	2023-12-11 13:42:19 +01:00
Jorge Penadés	8acd03f115	refs #6276 saleTrackingReplace	2023-12-11 13:01:34 +01:00
Javier Segarra	f817551a57	refs #5666 perf: remove ruleAlias property	2023-12-11 12:59:02 +01:00
Carlos Satorres	2beb1f65f0	refs #6085 findOne	2023-12-11 12:45:55 +01:00
Javier Segarra	d1f0557923	refs #5666 perf: remove ruleAlias property	2023-12-11 12:40:16 +01:00
Carlos Satorres	53ff8784ff	refs #6085 remove myOptions	2023-12-11 10:16:46 +01:00
Carlos Satorres	57ed36cdfc	ref #6085 remove console options	2023-12-11 09:43:38 +01:00
Carlos Satorres	584f3264ed	refs #6085 refactor sql trad	2023-12-11 08:54:58 +01:00
Jorge Penadés	e27bf2ef8b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-12-11 08:29:35 +01:00
Carlos Satorres	866ad7a9f9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail	2023-12-11 08:20:19 +01:00
Alex Moreno	f874faa921	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice	2023-12-11 07:47:55 +01:00
Pablo Natek	5a99408ba7	feat: refs #6548 add buyer department to salesPerson list in client BasicData	2023-12-11 07:31:57 +01:00
Jorge Penadés	b88d61e864	Merge commit '6fb4e8677' into 6274-loginWorkerTimeControl	2023-12-07 14:53:33 +01:00
Jorge Penadés	6fb4e86777	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into HEAD	2023-12-07 14:47:31 +01:00
Jorge Penadés	968dc65231	refs #6274 tests created	2023-12-07 14:47:22 +01:00
Sergio De la torre	9937fbed5e	REFS #6275 feat:Silex_to_Salix	2023-12-07 11:59:01 +01:00
Sergio De la torre	67994188ee	Merge branch 'dev' into 6028_routesByWorkerEmail	2023-12-07 10:42:30 +00:00
Sergio De la torre	fa65cc84a9	REFS #6275 feat:Silex_to_Salix	2023-12-07 11:39:22 +01:00
Sergio De la torre	0263d880ca	refs #6028 add:email in ByWorker	2023-12-07 08:00:17 +01:00
Carlos Satorres	3c9c221220	Merge branch 'dev' into 6010-testBackPending	2023-12-07 06:59:38 +00:00
Sergio De la torre	c9bcd672c9	refs #6028 add:email in ByWorker	2023-12-07 07:59:21 +01:00
Carlos Satorres	c7d960229d	Merge branch 'dev' into 6010-testBackPending	2023-12-07 06:34:32 +00:00
Carlos Satorres	acfa0fd857	Merge branch 'dev' into 6318-negativeQuantity	2023-12-07 06:31:21 +00:00
Javi Gallego	7ff8ec93ff	Merge pull request 'test' (!1879) from test into dev ... Reviewed-on: #1879	2023-12-06 07:54:13 +00:00
Jorge Penadés	bb186bafe0	Merge branch '6264-renewToken' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-12-05 14:12:00 +01:00
Javier Segarra	a7c48b6ddc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin	2023-12-05 13:02:34 +01:00
Javier Segarra	035b31d878	refs #5666 test: fix e2e tests	2023-12-05 12:00:31 +01:00
Jorge Penadés	25006a938b	refs #6274 refactor clockIn	2023-12-05 11:53:27 +01:00
Carlos Satorres	f55e85a189	refs #6010 remove pending	2023-12-05 10:35:48 +01:00
Carlos Satorres	af07a531ed	refs #6318 quantity	2023-12-05 08:49:55 +01:00
Sergio De la torre	3692021b12	Merge branch 'dev' into 6275-silex-to-salix	2023-12-05 07:26:22 +00:00
Sergio De la torre	318f7e3c0d	REFS #6275 feat:Silex_to_Salix	2023-12-05 08:20:55 +01:00
Javier Segarra	1d92bbf4a2	refs #5666 feat: replace base value and add mixins	2023-12-05 07:48:56 +01:00
Javier Segarra	57add7abf0	refs #5666 perf: replace Role by VnRole	2023-12-05 07:16:12 +01:00
Jorge Penadés	8cb97e2477	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-12-04 15:09:44 +01:00
Javier Segarra	a8b0a7a5b3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken	2023-12-04 14:46:21 +01:00
Carlos Satorres	6d486fbec9	refs #6085 trad, remove front, back test	2023-12-01 13:58:45 +01:00
Jorge Penadés	1dfdd94584	refs #6276 fix getItemPackingType	2023-12-01 13:56:43 +01:00
Jorge Penadés	4690dca4f9	refs #6276 getItemPackingType	2023-12-01 13:54:09 +01:00
Pablo Natek	bec1ff71ef	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTracking-change-workerFk-to-userFk	2023-12-01 13:43:27 +01:00
Jorge Penadés	660e77be55	refs #6276 updateFromSale refactored	2023-12-01 12:48:21 +01:00
Jorge Penadés	7e57640758	refs #6276 itemShelving_updateFromSale	2023-12-01 11:43:07 +01:00
Jorge Penadés	d2769f4c21	refs #6276 return fixed	2023-12-01 11:38:30 +01:00
Robert Ferrús	2a93dcf5b8	Merge branch 'dev' into 5854-itemShelvingTraduciones	2023-12-01 10:20:08 +00:00
Jorge Penadés	f2ab44bb8f	refs #6276 itemShelving_return	2023-12-01 10:14:32 +01:00
Jorge Penadés	30b63f577f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-12-01 09:49:49 +01:00
Jorge Penadés	d5f09c2f75	refs #6276 saleTrackingDel	2023-12-01 09:44:49 +01:00
Jorge Penadés	3333c83702	refs #6276 WIP itemShelving_return	2023-11-30 16:25:13 +01:00
Jorge Penadés	611b45bae0	Merge branch 'dev' into 5835-summaryRate	2023-11-30 15:16:18 +00:00
Alex Moreno	b2e7ea3089	refs #5914 feat: make invoice support rectificative	2023-11-30 15:16:41 +01:00
David Domenech	eb0766bafd	Merge branch 'dev' into 6398-ticketTracking-change-workerFk-to-userFk	2023-11-30 14:08:47 +00:00
Pablo Natek	72283005b8	remove(console.log): refs #3271 remove console.log	2023-11-30 14:43:14 +01:00
David Domenech	8ab981907d	refactor(ticketTracking.userFk): refs #6398 workerFk to userFk	2023-11-30 14:25:00 +01:00
Pablo Natek	c457b5c4d2	Merge branch 'test' into 3271-zoneGetFilterdFix	2023-11-30 12:39:26 +00:00
Jorge Penadés	40236fdb7b	refs #6276 itemShelvingMake_multi	2023-11-30 13:23:10 +01:00
Alex Moreno	ee7dd66ce9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-30 12:49:42 +01:00
Alex Moreno	35e74a7635	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-11-30 12:48:27 +01:00
Alex Moreno	016e4ae37c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-11-30 12:20:50 +01:00
Javier Segarra	01e7135224	refs #5666 feat: replace Role by VnRole in front	2023-11-30 12:20:05 +01:00
Pablo Natek	3f22f48df7	fix(getFiltered): refs #3271 fix to event filter	2023-11-30 12:13:12 +01:00
Javier Segarra	2a2998a8bc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin	2023-11-30 12:01:44 +01:00
Jorge Penadés	25a0ffcfde	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-11-30 09:49:50 +01:00
Jorge Penadés	6121eeaa3a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-summaryRate	2023-11-30 09:44:05 +01:00
Carlos Satorres	9cdb7c3cca	refs #6065 remove workcenter	2023-11-30 09:18:00 +01:00
Jorge Penadés	5442e3b4e0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-11-30 08:44:41 +01:00
Javier Segarra	97d7f8356f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken	2023-11-30 07:08:23 +01:00
Javier Segarra	1576ab992d	refs #6434 perf: new field in SignInLog table	2023-11-29 19:36:30 +00:00
Jorge Penadés	0d558fb4f7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-11-29 16:26:10 +01:00
Javi Gallego	d246b5f9a8	Merge branch 'dev' into 5652-fixtures-fix	2023-11-29 15:26:51 +01:00
Carlos Satorres	9a3efdd6fe	refs #6085 model y back	2023-11-29 13:55:44 +01:00
Jorge Penadés	877c679273	refs #6276 getVersion	2023-11-29 13:22:44 +01:00
Jorge Penadés	133fe1065a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-11-29 09:44:09 +01:00
Jorge Penadés	c609f6f47f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-11-29 09:27:50 +01:00
Carlos Satorres	e548ef4dae	refs #6085 searchpanel and change path	2023-11-29 07:51:58 +01:00
Carlos Satorres	0186c2c806	refs #6085 aclMail back	2023-11-29 07:33:49 +01:00
Jorge Penadés	29fb36010c	refs #6274 back methods created	2023-11-28 14:48:03 +01:00
Javier Segarra	63533459b0	refs #6434 feat: improve signIn method	2023-11-28 13:22:17 +01:00
Jorge Penadés	f2673c3818	refs #5835 rate added	2023-11-28 12:12:42 +01:00
Guillermo Bonet	1a5cc67312	Merge branch 'dev' into 6023-changeRol	2023-11-28 12:07:50 +01:00
Javi Gallego	2fa56cce4b	fix: refs #5652 arreglo fixtures	2023-11-28 09:22:00 +01:00
Javier Segarra	bb9723b65d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin	2023-11-28 08:18:11 +01:00
Javier Segarra	f5f2896cbf	refs 5666 feat: replace Role model by VnRole model	2023-11-28 08:12:16 +01:00
Alex Moreno	37555cbb63	refs #6335 warmFix(ticketAdvance): correct properties	2023-11-27 15:10:00 +01:00
Juan Ferrer	c7291e3367	Merge pull request 'test' (!1863) from test into dev ... Reviewed-on: #1863	2023-11-27 12:17:11 +00:00
Juan Ferrer	74772472d5	Merge pull request 'master' (!1820) from master into test ... Reviewed-on: #1820 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-11-27 12:16:42 +00:00
Robert Ferrús	5f26553092	Merge branch 'dev' into 5854-itemShelvingTraduciones	2023-11-27 11:05:50 +00:00
Robert Ferrús	62fab4e744	refs #5854 itemShelving traducciones	2023-11-27 11:52:37 +01:00
Guillermo Bonet	3bdb002034	Merge branch 'dev' into 3222-expenceToExpense	2023-11-27 09:06:17 +00:00
Guillermo Bonet	aefff68c29	refactor: refs #3222 Requested changes	2023-11-27 09:51:56 +01:00
Javier Segarra	901a44cc62	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken	2023-11-27 09:48:31 +01:00
Javier Segarra	72a0932e35	refs #6264 other: rename camel-case variable	2023-11-27 09:46:27 +01:00
Alex Moreno	3fb1ed9dfe	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6506-hotfixContract	2023-11-27 08:38:17 +01:00
Carlos Satorres	f9d5cad412	refs #6506 contract	2023-11-27 07:57:18 +01:00
Alex Moreno	824ca1d70a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice	2023-11-27 07:42:50 +01:00
Guillermo Bonet	2be1639e9f	refactor: refs #3222 Expence to expense	2023-11-24 12:42:25 +01:00
Jorge Penadés	53c8e87b5b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress	2023-11-24 10:57:32 +01:00
Jorge Penadés	8ac3887d80	refs #5811 rename methods	2023-11-24 10:53:38 +01:00
Jorge Penadés	c56588a472	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress	2023-11-24 10:18:47 +01:00
Jorge Penadés	b3584d9db5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-fixGetTotals	2023-11-24 10:12:45 +01:00
Carlos Satorres	5d18c211a0	refs #6507 state	2023-11-24 08:40:06 +01:00
Javi Gallego	4071c06b5f	feat: refs #6275 getTickets con los campos de silex	2023-11-24 08:15:39 +01:00
Carlos Satorres	8a568f180a	refs #6506 fix e2e, refactor business	2023-11-24 07:47:57 +01:00
Carlos Satorres	ebe467f721	refs #6506 hotfix	2023-11-24 07:04:55 +01:00
Javi Gallego	aa0794e136	Merge branch 'dev' into 6275-silex-to-salix	2023-11-24 06:31:25 +01:00
Jorge Penadés	e314a67fe7	refs #6274 time control methods migrated	2023-11-23 13:25:31 +01:00
Jorge Penadés	cf3b5efee9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-11-23 12:36:19 +01:00
Jorge Penadés	6b2c1e09de	refs #5835 refactor	2023-11-23 11:31:00 +01:00
Javi Gallego	5b145a57e6	error: refs 6028 test front quitado	2023-11-23 11:29:53 +01:00
Jorge Penadés	048e3089cd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-fixGetTotals	2023-11-23 11:26:41 +01:00
Jorge Penadés	db15285858	refs #5811 test updated	2023-11-23 11:21:56 +01:00
Jorge Penadés	2e67ef4f5d	refs #5811 refactor deleteExpeditions	2023-11-23 10:32:07 +01:00
Jorge Penadés	900dffbbba	refs #5811 delete viaexpress expeditions included	2023-11-23 10:26:28 +01:00
Javi Gallego	f44424dbcf	test: refs #6028 test	2023-11-23 09:44:47 +01:00
Javi Gallego	5b289ec083	Merge branch 'dev' into 6028_route_getRouteByWorker	2023-11-23 09:21:44 +01:00
Jorge Penadés	da7b670d74	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress	2023-11-23 08:28:56 +01:00
Alex Moreno	f4fabb9fff	refs #6491 refactor(order_filter): optimized	2023-11-23 08:26:14 +01:00
Carlos Satorres	2b455488a3	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-11-22 18:35:16 +01:00
Carlos Satorres	6b07ee4eb1	hotfix workerhours	2023-11-22 18:35:14 +01:00
Javi Gallego	e856de0cfd	feat: refs #6028 test	2023-11-22 15:54:38 +01:00
Jorge Penadés	26a8cc6a2c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress	2023-11-22 15:41:24 +01:00
Jorge Penadés	a60a30128c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-11-22 15:40:11 +01:00
Javi Gallego	e146c0ea46	Merge branch 'dev' into 6028_route_getRouteByWorker	2023-11-22 12:42:20 +01:00
Javi Gallego	a0a9e299d9	feat: refs #6275 getTickets with phone	2023-11-22 12:39:21 +01:00
Guillermo Bonet	d52c82fb19	Merge branch 'dev' into 4502-zoneEstimatedDelivery	2023-11-22 11:36:07 +00:00
Jorge Penadés	40bbad04c9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-11-22 10:16:12 +01:00