16345 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Andrés	d4dceac74c	Merge pull request '5772-reduceInvoicePdfSize' (!1632) from 5772-reduceInvoicePdfSize into dev ... Reviewed-on: #1632 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-06-22 11:45:50 +00:00
Vicent Llopis	389b53ceff	refs #5772 fix: back test	2023-06-22 13:37:43 +02:00
Carlos Andrés	12aa9c6b4b	Merge branch 'dev'	2023-06-22 13:23:03 +02:00
Carlos Andrés	b7cd32f4ce	refs #5772 eliminar tags en report invoice	2023-06-22 13:18:16 +02:00
Vicent Llopis	2d21da1faa	Merge pull request '5528-entry.latest-buys_fixEditBuys' (!1611) from 5528-entry.latest-buys_fixEditBuys into dev ... Reviewed-on: #1611 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-06-22 10:53:57 +00:00
Vicent Llopis	591fc14ffa	refs #5772 refactor: movido codigo para enviar rocket al back	2023-06-22 12:48:50 +02:00
Vicent Llopis	9d1a181b73	refs #5772 feat: si falla al enviar el pdf, envia un rocket al comercial	2023-06-22 11:10:56 +02:00
Vicent Llopis	d8fe284bcd	Merge branch 'dev' into 5528-entry.latest-buys_fixEditBuys	2023-06-22 07:53:11 +00: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
Vicent Llopis	ddaed3318d	Merge pull request 'fix: acl renewToken' (!1631) from fix_aclRenewToken into dev ... Reviewed-on: #1631 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-06-21 12:39:24 +00:00
Vicent Llopis	d9afdccd9c	fix: acl renewToken	2023-06-21 14:12:42 +02:00
Carlos Satorres	bb10b831ef	Merge pull request 'refs #5537 change cl c' (!1627) from 5537-refactorFootnotes into dev ... Reviewed-on: #1627 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-06-21 11:04:02 +00:00
Carlos Satorres	9ef12d129b	Merge branch 'dev' into 5537-refactorFootnotes	2023-06-21 10:57:03 +00:00
Juan Ferrer	dfdd3a1733	Merge branch '5772-reduceInvoicePdfSize' of https://gitea.verdnatura.es/verdnatura/salix into 5772-reduceInvoicePdfSize	2023-06-21 11:08:29 +02:00
Juan Ferrer	44192c0606	refs #5667 Client translations added	2023-06-21 11:08:28 +02:00
Carlos Andrés	6f9fd9bb72	refs #5772 mensajes de error	2023-06-21 09:40:14 +02:00
Vicent Llopis	56917fbfc4	Merge pull request '5468-account_privileges' (!1552) from 5468-account_privileges into dev ... Reviewed-on: #1552 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-06-20 12:48:34 +00:00
Vicent Llopis	f37974c835	Merge branch 'dev' into 5468-account_privileges	2023-06-20 12:39:27 +00:00
Vicent Llopis	3462e49d23	Merge pull request '5554-renovar_token' (!1566) from 5554-renovar_token into dev ... Reviewed-on: #1566 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-06-20 12:38:46 +00:00
Vicent Llopis	556bdb52ce	Merge branch 'dev' into 5554-renovar_token	2023-06-20 12:18:46 +00:00
Robert Ferrús	004bfdbe1e	Merge pull request '5112-entryUpdateComission' (!1621) from 5112-entryUpdateComission into dev ... Reviewed-on: #1621 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-06-20 12:18:26 +00:00
Vicent Llopis	f6cb1cb130	Merge branch 'dev' into 5554-renovar_token	2023-06-20 12:07:52 +00:00
Robert Ferrús	e83396de11	Merge branch 'dev' into 5112-entryUpdateComission	2023-06-20 10:00:34 +00:00
Juan Ferrer	2649db852f	refs #5772 Invoice PDF size reduced	2023-06-20 11:50:36 +02:00
Vicent Llopis	62818a9414	Merge pull request '5697-monitores_quitarFiltroFecha' (!1625) from 5697-monitores_quitarFiltroFecha into dev ... Reviewed-on: #1625 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-06-20 09:29:28 +00:00
Carlos Satorres	a7d9bbc582	refs #5537 change cl c	2023-06-20 10:22:30 +02:00
Vicent Llopis	6c00e704cc	refs #5697 fix: eliminado por la columna fecha, que no se formatea correctamente	2023-06-20 09:42:08 +02:00
Alex Moreno	5a6a18c76a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-20 09:20:54 +02:00
Alex Moreno	dcfb991f94	hotFix(getLeaves): remoteMethodCtx correct defined	2023-06-20 09:20:06 +02:00
Robert Ferrús	ffbaa45320	refs #5112 changelog	2023-06-20 09:05:39 +02:00
Robert Ferrús	503054fe05	refs #5112 modificaciones entry_updateComission	2023-06-20 08:58:22 +02:00
Vicent Llopis	8a2cab0e62	Merge branch 'dev' into 5528-entry.latest-buys_fixEditBuys	2023-06-20 05:30:55 +00:00
Juan Ferrer	9fa6e2df71	refs #5595 VnModel.rawSql() bugfix	2023-06-19 14:54:32 +02:00
Alex Moreno	63888e2d64	refs #5595 console.log(orderFk, userId) for rawSQL logs	2023-06-19 13:52:25 +02:00
Robert Ferrús	068eca80ab	Merge branch 'dev' into 5112-entryUpdateComission	2023-06-19 05:21:18 +00:00
Alex Moreno	2197441159	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-06-19 07:20:00 +02:00
Alex Moreno	70413fe0d6	Merge pull request 'refs #5327 warnFix(ticket_sale): fix orderBy amount itemPackingType' (!1604) from warnFix_ticket_sale_orderBy into test ... Reviewed-on: #1604 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-06-19 05:12:41 +00:00
Juan Ferrer	b1b9bf106a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-06-16 13:39:26 +02:00
Juan Ferrer	081cf43ece	refs #5667 SupplierAccount translation added	2023-06-16 13:39:24 +02:00
Vicent Llopis	4d957b7593	Merge pull request 'hotfix_ticketObservation' (!1620) from hotfix_ticketObservation into master ... Reviewed-on: #1620 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-06-16 10:53:26 +00:00
Vicent Llopis	72c413dccb	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotfix_ticketObservation	2023-06-16 12:23:23 +02:00
Alex Moreno	75bb0f8160	refs #5860 fix hash smbhash	2023-06-16 12:19:59 +02:00
Vicent Llopis	ef0ae335e8	fix: muestra las observaciones de los tickets	2023-06-16 11:56:36 +02:00
Alex Moreno	50fe53fbb6	Merge branch 'test' into warnFix_ticket_sale_orderBy	2023-06-16 05:38:14 +00:00
Alexandre Riera	a866b92b8c	Merge pull request 'fixes #5513 Crear back para añadir funcionalidad de Embalajes de la app' (!1605) from 5513-back-embalaje into dev ... Reviewed-on: #1605 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-06-16 05:15:43 +00:00
Alexandre Riera	73133778fc	Merge branch 'dev' into 5513-back-embalaje	2023-06-16 05:07:16 +00:00
Carlos Satorres	238a6406c5	Merge pull request '5325-defaultSearch-SmartTable' (!1613) from 5325-defaultSearch-SmartTable into dev ... Reviewed-on: #1613 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-06-15 17:49:33 +00:00
Carlos Satorres	7bff915a7f	refs #5325 back fix correct	2023-06-15 17:14:34 +02:00
Carlos Satorres	4157e30d4c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5325-defaultSearch-SmartTable	2023-06-15 16:47:33 +02:00