14630 Commits

All Branches

Search

Author	SHA1	Message	Date
Alexandre Riera	546b3f6c9b	refs #3291 lateral menu added, fixed tests	2023-02-03 15:21:27 +01:00
Joan Sanchez	8158cb6860	feat(db): export prod structure & data ... Refs: #5192	2023-02-03 15:08:41 +01:00
Alex Moreno	2717c6420c	fix(invoiceIn_descriptor): supplier.email	2023-02-03 14:58:58 +01:00
Vicent Llopis	ba5616055b	feat: item.descriptor en summary coge el warehouse por defecto	2023-02-03 14:31:50 +01:00
Joan Sanchez	38f34adc9a	Merge pull request 'master → test' (!1305) from master into test ... Reviewed-on: #1305	2023-02-03 12:44:42 +00:00
Vicent Llopis	065f91afcf	Merge pull request '4873-zone.delivery-day' (!1248) from 4873-zone.delivery-day into dev ... Reviewed-on: #1248 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-02-03 12:28:35 +00:00
Vicent Llopis	e69a6ae0dc	add changelog	2023-02-03 13:25:38 +01:00
Vicent Llopis	c32a627fe5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4873-zone.delivery-day	2023-02-03 13:23:42 +01:00
Guillermo Bonet	220f7ee0f8	Merge pull request '4975-mdbBranch-dsName' (!1304) from 4975-mdbBranch-dsName into master ... Reviewed-on: #1304	2023-02-03 12:09:27 +00:00
Guillermo Bonet	ca24de7ee5	refs #4975 Changed description	2023-02-03 12:50:19 +01:00
Guillermo Bonet	dddeca0832	refs #4975 Added property dsName in mdbBranch tab	2023-02-03 12:46:01 +01:00
Alex Moreno	cf9338e891	Merge pull request '5043-mock_Date' (!1260) from 5043-mock_Date into dev ... Reviewed-on: #1260 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-02-03 10:57:49 +00:00
Alexandre Riera	141ae7b11c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3291-entryLatestBuys-buscador	2023-02-03 11:56:09 +01:00
Alex Moreno	03d7a2908b	refactor: only mock vn.time from 2000 to 2002	2023-02-03 11:25:14 +01:00
Alex Moreno	575784c870	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-02-03 10:03:59 +01:00
Alex Moreno	15c1cdfcef	Merge pull request 'fixes #5170-feat(recover-password): use user' (!1300) from 5170-recover-password_use_user into dev ... Reviewed-on: #1300 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-02-03 08:18:28 +00:00
Alex Moreno	e16c16c194	Merge branch 'dev' into 5170-recover-password_use_user	2023-02-03 08:12:54 +00:00
Juan Ferrer	f4fc597c2c	Merge pull request 'master to test' (!1302) from master into test ... Reviewed-on: #1302	2023-02-03 08:12:09 +00:00
Pau	6c8609e180	Merge branch 'dev' into 5181-ticket.summary-recargo	2023-02-03 07:52:14 +00:00
Vicent Llopis	508bce73bc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available	2023-02-03 08:41:35 +01:00
Pau	be68d56af3	Merge pull request 'fixes #5174 Refactor ticket weekly to use smartTable' (!1275) from 5174-refactor-ticket-weekly into dev ... Reviewed-on: #1275 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-02-03 07:41:27 +00:00
Pau	199dd2ba8d	Merge branch 'dev' into 5181-ticket.summary-recargo	2023-02-03 06:09:38 +00:00
Pau	af1e68675f	Merge branch 'dev' into 5174-refactor-ticket-weekly	2023-02-03 06:04:52 +00:00
Alexandre Riera	6533b92ad3	Merge branch 'master' into hotFix-balance-compensation	2023-02-02 14:15:05 +00:00
Alexandre Riera	21281e09db	hotfix removed supplier	2023-02-02 15:13:53 +01:00
Alex Moreno	8a50c56284	fix(updateWorkCenter): use vnNew()	2023-02-02 14:52:40 +01:00
Alex Moreno	6c772643a8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-02-02 11:55:11 +01:00
Vicent Llopis	cf54415e61	Merge pull request '5084-monitor.index_tickets' (!1301) from 5084-monitor.index_tickets into dev ... Reviewed-on: #1301 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-02-02 10:52:51 +00:00
Alex Moreno	d5cf1f4ff8	Merge pull request 'fix: getRate2' (!1290) from hotFix_getRate2 into master ... Reviewed-on: #1290	2023-02-02 10:50:03 +00:00
Vicent Llopis	9f0f8729f5	Merge branch 'dev' into 5084-monitor.index_tickets	2023-02-02 10:35:15 +00:00
Vicent Llopis	15429293dd	fix: frontTest	2023-02-02 11:34:13 +01:00
Alexandre Riera	16a6167db0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3291-entryLatestBuys-buscador	2023-02-02 10:39:26 +01:00
Pau	6807d8d5b1	Merge pull request '4797-lilium-worker-notifications' (!1229) from 4797-lilium-worker-notifications into dev ... Reviewed-on: #1229 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-02-02 08:53:28 +00:00
Pau	cadd525380	Merge branch 'dev' into 5174-refactor-ticket-weekly	2023-02-02 08:36:07 +00:00
Pau	99e6ef5a36	Merge branch 'dev' into 4797-lilium-worker-notifications	2023-02-02 08:35:14 +00:00
Joan Sanchez	4d8af54b1e	Added version 23.06.01	2023-02-02 09:21:12 +01:00
Vicent Llopis	76865fc7b6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5084-monitor.index_tickets	2023-02-02 09:18:37 +01:00
Joan Sanchez	d45c0cb99a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-02-02 08:59:39 +01:00
Joan Sanchez	52d2e091ac	Merge pull request 'fixes #5131 Cambios en Ticket Advance' (!1291) from 5131-cambios-ticketAdvance into dev ... Reviewed-on: #1291 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-02-02 07:59:20 +00:00
Joan Sanchez	4477486f8e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-02-02 08:58:44 +01:00
Alexandre Riera	5f656a894f	buscador	2023-02-02 08:52:38 +01:00
Joan Sanchez	37b0b32c0d	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-02-02 08:50:48 +01:00
Joan Sanchez	85bde58752	Merge pull request 'fixes #4927 supplier.fiscal-data permitir 'Razón social' duplicada' (!1230) from 4927-permitir-razonSocial-duplicada into dev ... Reviewed-on: #1230 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-02-02 07:47:38 +00:00
Joan Sanchez	176b47bf97	Merge pull request 'fixes #5077 Ticket/Basic Data no guarda la hora de envío' (!1274) from 5077-horaEnvio-ticketBasicData into dev ... Reviewed-on: #1274 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-02-02 07:44:24 +00: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	52a3f77bc5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5077-horaEnvio-ticketBasicData	2023-02-02 08:39:28 +01:00
Joan Sanchez	d0e65b9539	Merge branch 'dev' into 4797-lilium-worker-notifications	2023-02-02 07:38:12 +00:00
Alex Moreno	5b228c5e71	Merge branch 'master' into hotFix_getRate2	2023-02-02 07:35:34 +00:00
Alex Moreno	4a587049fc	feat(recover-password): use user ... refs #5170	2023-02-01 15:13:38 +01:00
Alexandre Riera	96a3ae8912	Merge pull request 'fixes #5072 client.fiscal-data comprobar que tiene email' (!1278) from 5072-comprobar-email-clientFiscalData into dev ... Reviewed-on: #1278 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-02-01 08:55:33 +00:00