540 Commits

Author	SHA1	Message	Date
Javier Segarra	774514f8c7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-fiscalData-validations	2023-12-21 13:13:56 +01:00
Alex Moreno	9951e911ae	refs #5925 feat(docuware_upload): use userConfig.tabletFk	2023-12-21 10:39:46 +01:00
Alex Moreno	d30dcd7d70	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5925-docuwareTablet	2023-12-21 09:22:49 +01: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
Javier Segarra	c9af8cba81	refs #5878 feat: remove . for this message	2023-12-15 12:50:05 +01:00
Alex Moreno	356fe68696	refs #5914 fix: remove unnecessary translation	2023-12-15 08:57:09 +01:00
Alex Moreno	59f2e3d0e6	refs #5914 fix: remove unnecessary	2023-12-15 08:54:41 +01:00
Alex Moreno	21a1dbeae7	refs #5914 fix: ticket canBeInvoiced and optimized invoiceTickets	2023-12-14 15:56:49 +01:00
Javier Segarra	fb524e2f14	refs #5878 perf: handleError	2023-12-14 11:58:42 +01:00
Carlos Satorres	4e8bec5684	refs #5925 user error	2023-12-13 12:03:04 +01:00
Carlos Satorres	584f3264ed	refs #6085 refactor sql trad	2023-12-11 08:54:58 +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
Javier Segarra	94147bd2b2	refs #5858 feat: handle Error from middleware	2023-12-11 07:36:39 +01:00
Carlos Satorres	6d486fbec9	refs #6085 trad, remove front, back test	2023-12-01 13:58:45 +01:00
Alex Moreno	b2e7ea3089	refs #5914 feat: make invoice support rectificative	2023-11-30 15:16:41 +01:00
Javier Segarra	e5e97a047f	refs #5878 perf: front validations	2023-11-29 15:03:09 +01:00
Javier Segarra	0a76b6843f	refs #5878 feat: approach error-handler middleware	2023-11-29 15:02:44 +01:00
Javier Segarra	aa5218fb1a	refs #5878 feat: supplier translations	2023-11-27 15:06:39 +01:00
Javier Segarra	f8bf2e02de	refs #5878 test: fix	2023-11-27 08:12:00 +01:00
Javier Segarra	626c000ebb	refs #5878 perf: add translation	2023-11-25 21:13:50 +01:00
Javier Segarra	273db31c05	refs #5858 feat: approach to print bad field in model	2023-11-25 21:11:06 +01:00
Jorge Penadés	900dffbbba	refs #5811 delete viaexpress expeditions included	2023-11-23 10:26:28 +01:00
Alex Moreno	02e8b90926	refs #6454 test: fix e2e by dump	2023-11-21 10:12:07 +01:00
Alex Moreno	b8d256e4e4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate	2023-11-16 09:58:51 +01:00
Alex Moreno	f677382f96	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-16 09:29:53 +01:00
Alex Moreno	5bdf6a7338	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-11-16 07:56:23 +01:00
Alex Moreno	4896be51ef	fix: translation	2023-11-16 07:27:42 +01:00
Javi Gallego	a4328e607e	Merge branch 'dev' into 6207-incoterm-solo-en-serie-world	2023-11-15 10:11:05 +01:00
Javier Segarra	11352798f0	refs #6434 feat: save token in db for each login	2023-11-15 09:41:12 +01:00
Alex Moreno	47d85c4c61	refs #6335 fix: remove unnecessary translations	2023-11-13 12:54:02 +01:00
Alex Moreno	0fed5c1ab4	Merge branch 'dev' into 6335-ticketAdvance_splitOrCreate	2023-11-10 09:59:24 +00:00
Javi Gallego	9d54618620	fix: refs: #6207 impide facturar si no tienes incoterm	2023-11-08 10:01:02 +01:00
Alex Moreno	d06810b1b9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-11-03 14:58:55 +01:00
Jorge Penadés	0536486b8c	ref #5834 fix locale	2023-11-03 09:16:59 +01:00
Jorge Penadés	2cdebcd69f	check bank entity refs 5834	2023-11-03 09:15:41 +01:00
Alex Moreno	37dce99447	refs #6335 test(ticketAdvance): add test to keep price	2023-10-30 15:00:05 +01:00
Alex Moreno	a80715583c	refs #6335 feat(ticketAdvance): change the date if you can	2023-10-30 14:16:25 +01:00
Jorge Penadés	1231d6dd1d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-24 08:34:42 +02:00
Alex Moreno	ef1ddfd484	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-10-20 09:28:37 +02:00
Guillermo Bonet	5c51d7fb04	Merge branch 'test' into dev	2023-10-19 13:22:33 +02:00
Alex Moreno	da20697052	refs #6199 feat(sale_updateQuantity): can upload	2023-10-18 15:19:26 +02:00
Alex Moreno	002329b0a1	refs 6199 add quantityLessThanMin translation	2023-10-18 12:04:37 +02:00
Carlos Andrés	9c0334619d	refs #6199	2023-10-13 11:56:50 +02:00
Jorge Penadés	179d8ab87d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-10 11:30:53 +02:00
Pablo Natek	c4e3fdf510	Merge branch 'dev' into 6213-supplierFixCreateErrors	2023-10-06 06:03:03 +00:00
Jorge Penadés	c35899542d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-04 08:40:44 +02:00
Pablo Natek	7fd2d143c3	refs #6213 devMerge	2023-10-03 07:08:29 +02:00
Carlos Andrés	41ac907b05	refs #6254-collection_getTickets	2023-09-29 13:44:41 +02:00
Carlos Andrés	9a7cb3ef7b	refs #6254 collection_getTickets	2023-09-29 12:30:05 +02:00
Alex Moreno	1307d4727c	refs #6254 feat(collection): add getTickets	2023-09-27 15:08:36 +02:00
Sergio De la torre	ac3e9c811d	refs #5890 feat: itemShelvingSaleAsignado	2023-09-27 14:01:17 +02:00
Jorge Penadés	c8c06f498c	ref #5914 fixed tests e2e	2023-09-25 10:49:47 +02:00
Jorge Penadés	731bad5981	ref #5914 create ticket with new and refactor	2023-09-22 14:52:56 +02:00
Jorge Penadés	ac4aea7d38	ref #5914 created transfer issued invoice	2023-09-21 09:14:46 +02:00
Pablo Natek	324b3ed8ee	Merge branch 'dev' into 6213-supplierFixCreateErrors	2023-09-21 05:21:06 +00:00
Jorge Penadés	4870b0830b	ref #5914 fix refund and change method name	2023-09-20 11:06:30 +02:00
Jorge Penadés	87cee57e56	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-09-20 10:47:53 +02:00
Guillermo Bonet	4ccb09d057	Merge branch 'master' into test	2023-09-20 08:18:03 +02:00
Guillermo Bonet	6c34421413	refs #5995 Requested changes	2023-09-18 10:03:31 +02:00
Pablo Natek	f82af979ed	refs #6213 fixTraductionFile	2023-09-13 16:54:51 +02:00
Pablo Natek	ccfd8fad05	refs #6213 fixCreateError	2023-09-11 12:32:46 +02:00
Carlos Satorres	c2f73eb548	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-09-07 13:38:38 +02:00
Sergio De la torre	e7cd052199	refs #6132 add messageError	2023-08-31 13:49:00 +02:00
Carlos Satorres	017e0dd948	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-08-31 13:29:34 +02:00
Jorge Penadés	3d4a99b07e	refs 5914 transferInvoice created	2023-08-24 10:51:34 +02:00
Jorge Penadés	27ab6639c9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-08-10 13:26:42 +02:00
Jorge Penadés	7ca6c6b96d	refs #5914 fix merge	2023-08-08 15:10:15 +02:00
Alex Moreno	0d5c6ffdbe	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5976-transferSale_call_setDeleted	2023-08-08 07:10:25 +02:00
Carlos Satorres	b85023b46d	accent	2023-08-03 10:11:17 +02:00
Carlos Satorres	9b11479675	refs #5640 traducciones	2023-08-03 10:10:53 +02:00
Carlos Satorres	183fdacefc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5640-mayusFiscalDate	2023-08-03 10:01:11 +02:00
Jorge Penadés	50155cea8d	refs #5914 WIP transfer invoiceOut	2023-07-28 15:21:43 +02:00
Carlos Satorres	d01584bfb3	refs #4764 service	2023-07-27 15:15:55 +02:00
Jorge Penadés	543fbf3c0a	refs #5929 isEditableOrThrow created, tests passed	2023-07-25 15:35:08 +02:00
Jorge Penadés	9978db9d52	refs #5929 WIP test created	2023-07-25 11:33:01 +02:00
Jorge Penadés	4f80221101	refs #5929 added ACL and accurate errors	2023-07-24 10:34:44 +02:00
Vicent Llopis	4755c50cd8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5849-makeInvoice_solved	2023-07-20 07:22:30 +02:00
Alex Moreno	2c79056f34	refs #5976 error extended	2023-07-19 13:44:04 +02:00
Alex Moreno	f07ac89cb6	refs #5976 add custom error	2023-07-18 15:01:04 +02:00
Vicent Llopis	4c7f42acb5	a	2023-07-18 14:17:07 +02:00
Vicent Llopis	7bd378e9dd	refs #	2023-07-18 14:15:56 +02:00
Carlos Satorres	a5d1c68511	change err and traduction	2023-07-17 14:07:45 +02:00
Carlos Satorres	87f125453d	refs #5640 fix mayus quit function	2023-07-14 13:35:13 +02:00
Alex Moreno	ac4e264d53	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-07-13 08:43:50 +02:00
Vicent Llopis	551d06ee83	refs #5887 para eliminar sigue las mismas reglas que para añadir	2023-07-12 13:55:57 +02:00
Alex Moreno	9cb29b9166	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-07-12 13:05:17 +02:00
Vicent Llopis	d4217ff8d3	refs #5887 correct translations	2023-07-11 13:38:48 +02:00
Vicent Llopis	e1f12bea02	a	2023-07-11 12:33:44 +02:00
Vicent Llopis	93e70e699a	refs #5874 feat: refactorizado proceso facturación	2023-07-11 09:19:15 +02:00
Alex Moreno	63a8f40443	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-07-06 10:42:53 +02:00
Carlos Satorres	9c9b53917a	refs #5334 fix error	2023-07-06 08:20:33 +02:00
Carlos Satorres	83467c3b6c	refs #5334 quit es	2023-07-06 06:08:12 +02:00
Carlos Satorres	5000e05e05	refs #5334 merge + e2e solve	2023-07-04 09:57:16 +02:00
Alex Moreno	461e1d4d5d	refs #5475 feat: userUses, fix forbiddenError and merge in dev	2023-07-03 13:33:48 +02:00
Alex Moreno	f636c3b1ab	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-30 11:57:56 +02:00
Alex Moreno	c6bee8f2f9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-29 14:50:06 +02:00
Vicent Llopis	e3e0c7e97a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5774-ticket.lines_evitarCantidadNegativa	2023-06-28 14:31:54 +02:00
Guillermo Bonet	cc5021a75f	refs #5684 Removed xxxLog.create and dependences	2023-06-26 09:40:55 +02:00
Alex Moreno	798481b24a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-26 07:53:44 +02:00
Carlos Andrés	12aa9c6b4b	Merge branch 'dev'	2023-06-22 13:23:03 +02:00
Vicent Llopis	591fc14ffa	refs #5772 refactor: movido codigo para enviar rocket al back	2023-06-22 12:48:50 +02:00
Carlos Andrés	807596f735	refs #5772	2023-06-22 08:50:18 +02:00
Carlos Andrés	10a25ff590	refs #5772	2023-06-22 07:49:35 +02:00
Carlos Andrés	6f9fd9bb72	refs #5772 mensajes de error	2023-06-21 09:40:14 +02:00
Alex Moreno	d6c504d3bb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-21 07:53:40 +02:00
Vicent Llopis	f6cb1cb130	Merge branch 'dev' into 5554-renovar_token	2023-06-20 12:07:52 +00:00
Alex Moreno	dd157d59d9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-16 13:42:13 +02:00
Alex Moreno	3a5e591cf0	refs #5475 feat(signin): use twoFactor and passExpired	2023-06-14 15:15:00 +02:00
Alex Moreno	aeb04efe82	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-13 11:49:42 +02:00
Vicent Llopis	61f99744c9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token	2023-06-13 07:43:23 +02:00
Alex Moreno	a07ca62476	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5094-ticket_index_docuware	2023-06-13 07:11:39 +02:00
Alex Moreno	d3c4a6ba5c	refs #5094 feat(ticket_index): docuware multiple deliveryNote	2023-06-12 15:20:46 +02:00
Alex Moreno	051269d646	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-12 09:11:17 +02:00
Vicent Llopis	cf559b2ba5	refs #5774 feat: solo se pueden añadir cantidades negativas si es un ticket de abono	2023-06-08 09:19:57 +02:00
Vicent Llopis	3fdb546d86	refs #5554 refactor: eliminado vnTokenCreated y añadido a vnToken.created	2023-06-07 10:28:29 +02:00
Alex Moreno	9462ca90a7	refs #5472 refactor setPassword & changePassword, fix sync	2023-06-01 15:29:46 +02:00
Alex Moreno	d134ca45f1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-01 14:19:23 +02:00
Alex Moreno	e19ece6119	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5678-sale-canEdit-notSale	2023-05-25 07:34:54 +02:00
Alex Moreno	292d9e038d	typo	2023-05-24 13:38:11 +02:00
Alex Moreno	6b66eb3bb2	refs #5679 typo	2023-05-24 12:59:58 +02:00
Alexandre Riera	856dcf18cb	refs #5677 locations	2023-05-24 12:17:41 +02:00
Alexandre Riera	05fb0a7203	refs #5677 tickets without state fixed	2023-05-24 12:16:19 +02:00
Alex Moreno	30c896c975	refs #5678 feat(sale_canEdit): handle exist sale	2023-05-24 11:20:07 +02:00
Alexandre Riera	e7d16dc8ba	refs #4797 fix test, add getList	2023-05-09 11:34:32 +02:00
Alex Moreno	8ae67799a1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-05-09 07:11:09 +02:00
Alex Moreno	bf3aac70f3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-05-03 11:37:07 +02:00
Alex Moreno	79e7e7c604	refs #5472 feat: add change-password section	2023-05-02 15:16:13 +02:00
Alexandre Riera	13c37e88ef	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-05-02 11:38:07 +02:00
Alexandre Riera	c2de5c5ff4	refs #4797 added redirection section	2023-05-02 07:28:59 +02:00
Carlos Satorres	38142c121d	refs #5540 mods client	2023-04-28 12:12:26 +02:00
Alex Moreno	42fc0b62d8	refs #5472 feat(user): add passExpired	2023-04-27 15:18:27 +02:00
Carlos Satorres	e1864fec09	arreglo json	2023-04-27 13:26:22 +02:00
Carlos Satorres	08c173acf1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5540-validarSupplierIsVies	2023-04-27 12:49:01 +02:00
Carlos Satorres	07148f6c29	refs #5540 mon message	2023-04-27 11:31:26 +02:00
Carlos Satorres	67db2f0476	Merge branch 'dev' into 5540-validarSupplierIsVies	2023-04-24 06:51:41 +00:00
Alex Moreno	7a79dfd4d1	deploy: 231401 test to dev	2023-04-21 12:49:03 +02:00
Carlos Satorres	d8b5659a5d	refs #5540 client vies	2023-04-21 09:14:30 +02:00
Alexandre Riera	b3a10698af	hotfix negativeBases	2023-04-21 08:20:38 +02:00
Alex Moreno	63e0031bc6	deploy(231401): test to master	2023-04-20 08:24:43 +02:00
Juan Ferrer	378400c6d2	refs #5553 Image scrubing method improved ... Remove & dryRun options, check that collection exists, performance improved, exclusive lock	2023-04-17 18:19:25 +02:00
Joan Sanchez	f5d26bdb99	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-04-13 12:00:22 +02:00
Joan Sanchez	b5f2cf3711	Added unit test & translation fixes	2023-04-13 11:54:56 +02:00
Alexandre Riera	ce28339973	refs #5522 deleted trigger afterInsert, added hook beforeInsert	2023-04-11 09:48:31 +02:00
Joan Sanchez	2e0325e567	Validate code	2023-04-06 14:59:25 +02:00
Vicent Llopis	3630c7d398	refs #5410 creada ruta de back para enviar emails	2023-04-04 14:09:55 +02:00
Alexandre Riera	a94e47e622	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar	2023-03-20 09:54:02 +01:00
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	2a6848c09a	refs #5000 invoiceOutGlobal	2023-03-14 09:17:39 +01:00