16536 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	c63df30e5c	refs #5334 fix back	2023-06-20 09:19:20 +02:00
Carlos Satorres	a155f846c2	refs #5334 fix ctx	2023-06-20 09:15:37 +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
Carlos Satorres	4537344790	merge	2023-06-20 08:20:13 +02:00
Carlos Satorres	7f20973650	refs #5334 merge	2023-06-20 08:16:36 +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
Carlos Satorres	168e7f1929	changelog	2023-06-19 13:48:54 +02:00
Carlos Satorres	3701acd26e	refs #5334 error getLeaves solve	2023-06-19 13:48:14 +02:00
Carlos Satorres	98125f8974	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-06-19 13:22:41 +02:00
Carlos Satorres	d4cc9cf82a	change log remove	2023-06-19 13:21:26 +02:00
Sergio De la torre	b6c8ca20ee	refs #5339 data	2023-06-19 08:58:20 +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
Alex Moreno	e8d28ddb02	v232601	2023-06-15 15:15:41 +02:00
Alex Moreno	5163b7b253	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-15 15:14:41 +02:00
Vicent Llopis	55990869e2	refs #5688 ya no muestra mensaje de error	2023-06-15 14:16:26 +02:00
Vicent Llopis	b7b6f413ba	refs #5688 feat: no mostrar datos si no tiene workerCenterFk	2023-06-15 14:15:22 +02:00
Vicent Llopis	192f4c7864	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5688-worker.calendar_workCenter	2023-06-15 14:15:00 +02:00
Sergio De la torre	a43792be26	Merge pull request 'refs #5651 packingSiteAdvanced' (!1615) from 5651-packingSiteAdvanced into dev ... Reviewed-on: #1615 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-06-15 11:40:41 +00:00
Juan Ferrer	1c666cd48e	refs #5595 Fix: ctx & userId removed from TpvTransaction/confirm	2023-06-15 13:10:44 +02:00
Carlos Satorres	8b832c68b3	refs #5325 fix back	2023-06-15 12:49:53 +02:00
Alexandre Riera	5825d5e16a	Merge branch '5513-back-embalaje' of https://gitea.verdnatura.es/verdnatura/salix into 5513-back-embalaje	2023-06-15 12:06:44 +02:00
Alexandre Riera	2a34abac61	refs #5513 minor fixes	2023-06-15 12:06:42 +02:00
Alex Moreno	71651b96a3	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-06-15 11:49:40 +02:00
Alex Moreno	99ad9d3afa	refs #5753 fix(change-password)	2023-06-15 11:49:39 +02:00
Alex Moreno	d9c7d3b8f0	Merge pull request '5842-hotfix_recalcularFechaFactura' (!1617) from 5842-hotfix_recalcularFechaFactura into master ... Reviewed-on: #1617 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-06-15 08:32:03 +00:00
Vicent Llopis	5f2c5c5f9d	refs #5842 delete console.log	2023-06-15 09:55:32 +02:00
Vicent Llopis	a50de4e509	refs #5842 feat: comprueba que invoiceDate no sea null	2023-06-15 09:50:46 +02:00
Alex Moreno	3862e3084e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-06-15 07:32:25 +02:00
Alex Moreno	44381e4a1c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-06-15 07:31:43 +02:00
Alex Moreno	a206f64e3c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-06-15 07:27:04 +02:00
Vicent Llopis	14ebcf96c0	refs #5842 refactor: change names	2023-06-15 07:24:17 +02:00
Sergio De la torre	1f454e6219	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-back-embalaje	2023-06-15 07:22:10 +02:00
Carlos Satorres	9cdc914a25	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5325-defaultSearch-SmartTable	2023-06-14 17:03:09 +02:00