474 Commits

Author	SHA1	Message	Date
Alexandre Riera	0b4a6874d1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar	2023-03-16 09:16:50 +01:00
Alexandre Riera	f037575428	Merge branch 'dev' into 4632-guardarFirmas-salix	2023-03-16 08:06:17 +00:00
Carlos Andrés	6b375cbaaa	refs #5000 InvoiceOut	2023-03-14 09:34:41 +01:00
Carlos Andrés	2a6848c09a	refs #5000 invoiceOutGlobal	2023-03-14 09:17:39 +01:00
Alexandre Riera	7c3c3a2d66	refs #4632 added userError	2023-03-09 08:31:38 +01:00
Joan Sanchez	23a15ee15c	Merge branch 'dev' into 5092-listado-ticketsSinFacturar	2023-03-08 06:50:16 +00:00
Vicent Llopis	0bda8c0ed6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2023-03-07 09:14:30 +01:00
Vicent Llopis	5248fd7fcf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2023-03-06 10:20:57 +01:00
Alexandre Riera	4e800a7a45	.	2023-03-06 09:30:14 +01:00
Alexandre Riera	f2bd0253e2	refs #5092 added unbilled tickets section	2023-03-06 09:27:53 +01:00
Javi Gallego	780572a9f2	test fixed	2023-03-06 08:14:26 +01:00
Joan Sanchez	b8881a050c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-02 07:41:16 +01:00
Carlos Andrés	6f5e25493d	invoicing test	2023-03-01 10:36:38 +01:00
Alexandre Riera	2e09845dbd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5149-check-ticket.refund	2023-03-01 08:29:58 +01:00
Guillermo Bonet	15f2f46e4c	refs #4975 Traduction no branch	2023-02-28 14:48:17 +01:00
Guillermo Bonet	656685cd7e	refs #4975 Minor changes	2023-02-28 14:35:34 +01:00
Alexandre Riera	e9dca9211c	refs #5149 checked if ticket has refunds, added translations	2023-02-28 13:42:18 +01:00
Alexandre Riera	5d9220c5c0	refs #5287 locker added	2023-02-27 08:39:46 +01:00
Carlos Andrés	4cc6485cbd	refs #5000 Invoicing RC	2023-02-23 09:25:23 +01:00
Vicent Llopis	222032aae7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2023-02-09 08:38:08 +01:00
Alexandre Riera	780018e4df	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada	2023-02-02 08:40:49 +01:00
Alexandre Riera	62766706b1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5072-comprobar-email-clientFiscalData	2023-02-01 08:52:03 +01:00
Alexandre Riera	7d7e1a74da	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada	2023-02-01 08:46:28 +01:00
Alexandre Riera	fd440a4db3	refs #5129 better translation tracked sales	2023-01-31 15:42:36 +01:00
Alexandre Riera	a358e58171	docuware translation	2023-01-31 12:12:25 +01:00
Alexandre Riera	7d617c0ac4	refs #5129 translations and userErrors added	2023-01-31 09:04:45 +01:00
Alexandre Riera	7e5f50e637	refs #5072 email validation added	2023-01-30 08:30:39 +01:00
Vicent Llopis	1154179ddf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2023-01-24 08:11:46 +01:00
Alexandre Riera	07d3fef8f0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada	2023-01-23 13:44:19 +01:00
Alex Moreno	a674169ddb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2023-01-20 08:30:30 +01:00
Alexandre Riera	292372395e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada	2023-01-20 07:15:03 +01:00
Vicent Llopis	b7004e6a76	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2023-01-17 12:50:34 +01:00
Guillermo Bonet	3d4600d70d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4975-mdbVersion-last-method	2023-01-16 12:26:10 +01:00
Alexandre Riera	b3c6443277	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada	2023-01-16 10:33:35 +01:00
Alex Moreno	def41c011c	feat(docuware_upload): send to trash last file	2023-01-13 13:33:59 +01:00
Alexandre Riera	41671e8a3a	refs #4927 modified hook to check name & country	2023-01-13 08:38:29 +01:00
Guillermo Bonet	868c2aaaef	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4975-mdbVersion-last-method	2023-01-12 15:25:51 +01:00
Alex Moreno	5bb66fec3f	test(docuware): back tests	2023-01-12 15:16:38 +01:00
Guillermo Bonet	e0e34595f4	refs #4975 Added translations	2023-01-09 18:46:19 +01:00
Vicent Llopis	5a5e4c5afb	feat: solo coge los tickets que no esten eliminados	2023-01-09 14:47:52 +01:00
Vicent Llopis	d16235cba9	fix: show error when is negative base	2023-01-05 10:55:56 +01:00
Alex Moreno	2c5e42d408	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2022-12-28 11:49:16 +01:00
Vicent Llopis	7f80c7ed2c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-12-22 09:30:35 +01:00
Vicent Llopis	06075aa17b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4804-ticket.descriptor_sms	2022-12-21 12:15:21 +01:00
Vicent Llopis	1d7145d74b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-12-21 08:05:19 +01:00
Alexandre Riera	284f9f418b	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-12-20 09:54:47 +01:00
Alexandre Riera	6ef282feda	refs #4962 updated merge, changed autoload, changed tf->Future	2022-12-20 09:54:28 +01:00
Guillermo Bonet	dc82e610b7	refs #4975 Minor changes	2022-12-19 11:24:18 +01:00
Guillermo Bonet	a46c2ced7c	refs #4975: Added last mdbVersion/last method	2022-12-19 07:26:07 +01:00
Alexandre Riera	45b02c3bc6	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-12-16 13:45:25 +01:00
Alex Moreno	156f2b9129	feat: handle errors and autogenerate user and code	2022-12-14 15:03:55 +01:00
Carlos Andrés	41b7b6ab06	Merge branch 'dev' into 4865-sintaxis-mensajes-de-rocket	2022-12-12 08:24:11 +00:00
Vicent Llopis	444d495b7f	refactor: codigo reducido	2022-12-01 07:22:13 +01:00
Vicent Llopis	ba8fe7dfa8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-12-01 07:11:00 +01:00
Vicent Llopis	1588492f9a	feat: solo añade los logs de salix con el model 'Sale'	2022-11-30 13:29:39 +01:00
Alexandre Riera	acbd0474a5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-29 08:50:48 +01:00
Carlos Andrés	6b76804913	refs #4865 Sintaxis mensajes rocket	2022-11-28 10:52:15 +01:00
Alex Moreno	804db15ece	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-28 07:53:51 +01:00
Vicent Llopis	dbbce77cc8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-11-25 07:41:43 +01:00
Alexandre Riera	32e4a7273c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-24 09:59:59 +01:00
Vicent Llopis	f313a53cde	refactor: cambiadas fixtures, backTest y traducciones	2022-11-23 10:56:55 +01:00
Alex Moreno	314e98b838	fix: nested router	2022-11-22 14:57:52 +01:00
Alex Moreno	660648e01f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-22 14:35:25 +01:00
Vicent Llopis	32f28e91b5	feat: sistema de bloque para ficheros mdb	2022-11-22 14:29:42 +01:00
Alexandre Riera	d7843f3298	Merge branch '4547-fix-compensation' of https://gitea.verdnatura.es/verdnatura/salix into 4547-fix-compensation	2022-11-22 14:24:55 +01:00
Alexandre Riera	34fb80beec	fix translations	2022-11-22 14:24:19 +01:00
Alexandre Riera	6656ea4f54	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-22 10:20:42 +01:00
Alexandre Riera	2651081838	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour	2022-11-22 10:15:31 +01:00
Alexandre Riera	4c21ffac3b	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-21 11:44:53 +01:00
Alexandre Riera	463e56b631	corrections	2022-11-21 11:41:17 +01:00
Alexandre Riera	4feb2bea2c	working on e2e	2022-11-16 10:57:15 +01:00
Alex Moreno	8dcd567a68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-15 13:20:52 +01:00
Alexandre Riera	607f61092a	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-15 13:06:10 +01:00
Alexandre Riera	01607c71b6	fix rocket message and order table	2022-11-15 13:03:55 +01:00
Alex Moreno	bcab493f37	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-11-15 07:33:53 +01:00
Alexandre Riera	05f0eba741	Merge branch 'split-tour' into 3963-ticket-advance	2022-11-14 09:06:51 +01:00
Alexandre Riera	03ea2b4f11	refs #4700 translations	2022-11-14 08:55:27 +01:00
Alexandre Riera	c16210dd8a	refs #4700 working on e2e	2022-11-11 15:58:11 +01:00
Vicent Llopis	918ea3030d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail	2022-11-10 14:41:12 +01:00
Alex Moreno	4c216c4556	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-10 14:40:55 +01:00
Alex Moreno	32701794bc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-11-10 13:34:43 +01:00
Guillermo Bonet	6804c1a756	Merge branch 'dev' into 4550-printServer	2022-11-09 16:55:29 +01:00
Guillermo Bonet	6744b3f797	added collection-label	2022-11-08 14:40:38 +01:00
Vicent Llopis	1bc8cf52d5	add translate	2022-11-08 08:20:36 +01:00
Vicent Llopis	d34a4ae992	add translate	2022-11-08 08:19:25 +01:00
Vicent Llopis	51b047eacc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail	2022-11-08 07:40:31 +01:00
Alexandre Riera	896a7eb6f0	refs #4700 arreglar filtro y traducciones	2022-11-07 15:55:17 +01:00
Vicent Llopis	7fc18c89df	feat: error handlers	2022-11-07 13:57:54 +01:00
Alex Moreno	e6e8f15d64	Merge branch 'dev' into 3569-refactor_isEditable-canEdit	2022-11-03 08:39:10 +00:00
Alex Moreno	36894c31de	Merge branch 'dev' into 4077-login_recover-password	2022-11-03 08:39:04 +00:00
Vicent Llopis	8a4aa6285b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-11-02 14:49:39 +01:00
Vicent Llopis	6df74facdc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail	2022-11-02 14:23:20 +01:00
Alex Moreno	6a9134d8f9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-11-02 13:48:36 +01:00
Alex Moreno	9c671ed3a4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-02 13:47:00 +01:00
Alex Moreno	755a1667dc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-02 07:35:04 +01:00
Alex Moreno	fc7a39e910	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order	2022-11-02 07:33:07 +01:00
Vicent Llopis	d9107719fa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail	2022-10-31 15:04:33 +01:00
Vicent Llopis	3243d35bd7	feat: send email	2022-10-31 14:48:37 +01:00
Alex Moreno	36c0cc1a38	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-31 14:12:40 +01:00
Alex Moreno	cf24301bfe	feat(account): email-verify refs #4077	2022-10-26 13:28:26 +02:00
Vicent Llopis	d4e2783630	refactor: corregidas traducciones, eliminado destroyAll y añadida transacción	2022-10-26 08:39:07 +02:00
Alex Moreno	f65d06fc7d	fixes #4073	2022-10-26 08:27:28 +02:00
Vicent Llopis	9ea427dbfe	refactor: move front to back funcionality	2022-10-18 13:45:46 +02:00
Alex Moreno	79b970286c	refactor(claim_claimPickupEmail): use text template and external form	2022-10-17 11:22:27 +02:00
Alex Moreno	ce2ad32ac9	add email template	2022-10-10 15:16:56 +02:00
Alex Moreno	5c4daee35e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-10-10 14:20:22 +02:00
Alex Moreno	376d46b67e	feat(canEdit): integrate isWeekly and adapt back tests and e2e	2022-10-10 13:06:49 +02:00
Vicent Llopis	c8d270499b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4570-tickets_translation	2022-10-06 11:50:11 +02:00
Vicent Llopis	aa51fa1722	feat: check the client to edit is in vn.client and not in account.account	2022-10-05 12:36:36 +02:00
Vicent Llopis	197bbf392b	refator: updates translations	2022-10-04 07:50:37 +02:00
Alex Moreno	81752e7f30	quit userError	2022-09-28 12:20:29 +02:00
Alex Moreno	d2cbaa565e	add translation	2022-09-26 08:48:46 +02:00
Alex Moreno	dc605387ba	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-09-26 08:23:10 +02:00
Alex Moreno	fc5460dc9e	feat(account): send verifyEmail when change email and tests	2022-09-26 08:21:58 +02:00
Alex Moreno	c79f884526	feat(recover-password): open changePass in front and tests done	2022-09-22 09:22:24 +02:00
Joan Sanchez	284524e3fa	Merge pull request '4358-financialBoss' (#1054) from 4358-financialBoss into dev ... Reviewed-on: #1054 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-21 06:49:44 +00:00
Alex Moreno	918863ee8e	feat(account): recover-password	2022-09-20 15:21:01 +02:00
Alex Moreno	b3aaa493d5	fix(): fix fixtures and all code needed for change the structure	2022-09-19 09:45:28 +02:00
Alex Moreno	4f7218ab76	translation	2022-09-14 13:01:40 +02:00
Joan Sanchez	768e4d5e77	Resolved conflicts	2022-08-10 12:13:31 +02:00
Vicent Llopis	c3d396b042	fix: test e2e	2022-08-04 13:52:59 +02:00
Joan Sanchez	c369453bfc	Added model fields	2022-05-31 13:36:27 +02:00
Alex Moreno	5bad0592a5	change errors	2022-05-10 08:48:51 +02:00
Vicent Llopis	5f2424dc44	feat(ticket): add option 'refund all' in descriptor menu	2022-04-04 13:26:53 +02:00
Vicent Llopis	e29f820e60	feat(ticket_line): new table ticketRefund and update proc ticket_doRefund	2022-03-30 08:56:35 +02:00
Carlos Jimenez Ruiz	39694b31b8	Merge branch 'dev' into 3607-supplier_agencyTerm	2022-03-28 08:40:32 +00:00
Vicent Llopis	fd7afc962f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm	2022-03-23 12:53:33 +01:00
Vicent Llopis	1056060957	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3721-claim_basic-data	2022-03-23 12:37:34 +01:00
Joan Sanchez	52b61d16ac	Merge pull request '3638-export_database' (#899) from 3638-export_database into dev ... Reviewed-on: #899 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-03-23 10:43:14 +00:00
Vicent Llopis	29036cc39d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm	2022-03-21 13:17:52 +01:00
Vicent Llopis	fae267f539	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3721-claim_basic-data	2022-03-21 13:15:46 +01:00
Carlos Jimenez Ruiz	728a5de311	Merge branch 'dev' into 3625-ticket_log_routeFk	2022-03-21 11:56:44 +00:00
Vicent Llopis	e4eed95724	notify rocket when claimState change to canceled	2022-03-21 10:02:56 +01:00
Vicent Llopis	644c24fa3b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm	2022-03-17 11:55:07 +01:00
Vicent Llopis	a3dbec82bd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database	2022-03-17 07:59:07 +01:00
Vicent Llopis	2f53733151	refactor translates	2022-03-15 15:05:09 +01:00
Alex Moreno	4dea046c97	feat(ticket_log): add routeFk log	2022-03-15 10:07:39 +01:00
Vicent Llopis	aa5ff474ec	solved test e2e	2022-03-11 12:21:39 +01:00
Vicent Llopis	a32ebc37da	add supplier autonomous	2022-03-09 23:54:23 +01:00
Vicent Llopis	03c8ceffb2	refactor code	2022-03-07 13:54:18 +01:00
Alex Moreno	e09e84c36b	refactor(setSaleQuantity): rename, remove transaction	2022-02-08 12:41:55 +01:00
Joan Sanchez	87ae05c997	Added translation	2022-02-01 12:51:38 +01:00
Alex Moreno	8794f8639f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3542-ticket_sale_payback	2022-01-25 15:04:52 +01:00
Alex Moreno	6d9afd5f4c	feat(ticket_sale): role restriction to create payBack	2022-01-21 11:40:48 +01:00
Javi Gallego	6d66ab7bea	getTotals without transaction	2022-01-20 10:05:24 +01:00
Joan Sanchez	52d7b4f600	Updated unit tests	2022-01-20 09:53:40 +01:00
Javi Gallego	3c8e6a16a2	Merge branch 'dev' into 2883-invoiceIn-Booking	2022-01-19 14:19:29 +01:00
Carlos Jimenez Ruiz	cc3e2fbc3a	can't transfer claimed sales without claimManager role	2022-01-12 10:17:51 +01:00
Alex Moreno	5462af91ee	extract to variable	2022-01-10 11:38:02 +01:00
Alex Moreno	860499db82	refactor(ticket): add more text in error when change zone	2022-01-07 08:28:57 +01:00