14420 Commits

All Branches

Search

Author	SHA1	Message	Date
Pau	650cc68f4a	requested changes	2023-02-01 08:42:20 +01:00
Alex Moreno	00ffc82f8d	use CURDATE() in rawSQL	2023-02-01 08:34:14 +01:00
Alex Moreno	4a1c97c6b2	Merge branch 'dev' into 4797-lilium-worker-notifications	2023-02-01 07:00:12 +00:00
Alexandre Riera	5d0ac58850	Merge pull request 'fixes #5088 client.balance quitar texto en balance' (!1296) from 5088-clientBalance-ponerReceiptId into dev ... Reviewed-on: #1296 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-02-01 06:26:50 +00:00
Alexandre Riera	a52be50dad	Merge branch 'dev' into 5088-clientBalance-ponerReceiptId	2023-02-01 06:18:41 +00:00
Alexandre Riera	17bb4b6072	refs #5088 added receiptId	2023-02-01 07:17:16 +01:00
Alexandre Riera	d046cd69a9	Merge pull request 'fixes #5129 Enriquecer mensaje si no se pueden editar ticket.sale' (!1287) from 5129-enriquecer-mensaje into dev ... Reviewed-on: #1287 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-02-01 06:13:15 +00:00
Alex Moreno	2528b2d3ad	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-02-01 07:10:51 +01:00
Alexandre Riera	fd440a4db3	refs #5129 better translation tracked sales	2023-01-31 15:42:36 +01:00
Alexandre Riera	11a605ea04	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5129-enriquecer-mensaje	2023-01-31 15:40:54 +01:00
Alexandre Riera	c6f87f9084	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5131-cambios-ticketAdvance	2023-01-31 15:39:03 +01:00
Alexandre Riera	a3da71996a	refs #5131 changelog	2023-01-31 15:36:51 +01:00
Alexandre Riera	349829e5ed	refs #5131 fixed tests	2023-01-31 15:29:00 +01:00
Alexandre Riera	3622eda589	refs #5131 added lines liters to origin ticket	2023-01-31 15:09:16 +01:00
Alexandre Riera	19d7e7e610	refs #5131 totalWithVat order	2023-01-31 14:23:40 +01:00
Alexandre Riera	955ca91073	Merge branch 'dev' into 5072-comprobar-email-clientFiscalData	2023-01-31 13:20:45 +00:00
Alexandre Riera	b70557ee86	refs #5131 agencies icon	2023-01-31 14:20:08 +01:00
Alexandre Riera	5e9cf65c1b	Merge pull request 'fixes #5104 Convertir todos los precios a precio grouping/packing' (!1286) from 5104-convert-prices into dev ... Reviewed-on: #1286 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-01-31 12:58:20 +00:00
Alexandre Riera	87bef62e35	refs #5131 hasStock refers to origin	2023-01-31 13:21:51 +01:00
Alexandre Riera	e5b7ebd8b4	refs #5131 IPT null or value	2023-01-31 13:06:58 +01:00
Alexandre Riera	331b278726	refs #5131 checkbox pending origin destination	2023-01-31 13:00:25 +01:00
Pau	4c4f39282e	Merge branch 'dev' into 4797-lilium-worker-notifications	2023-01-31 11:13:14 +00:00
Alexandre Riera	d218fb9245	Merge branch '5129-enriquecer-mensaje' of https://gitea.verdnatura.es/verdnatura/salix into 5129-enriquecer-mensaje	2023-01-31 12:12:28 +01:00
Alexandre Riera	a358e58171	docuware translation	2023-01-31 12:12:25 +01:00
Alexandre Riera	b6f09b3262	Merge branch 'dev' into 5129-enriquecer-mensaje	2023-01-31 11:09:45 +00:00
Pau	20ffcff219	Merge branch 'dev' into 5174-refactor-ticket-weekly	2023-01-31 10:57:56 +00:00
Alexandre Riera	906f80da5a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5104-convert-prices	2023-01-31 11:56:41 +01:00
Pau	397a7e2705	Merge pull request 'closes #5148 change style to pre-line' (!1285) from 5148-logs-style into dev ... Reviewed-on: #1285 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-31 10:46:26 +00:00
Alexandre Riera	9d0891e080	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5129-enriquecer-mensaje	2023-01-31 11:43:49 +01:00
Alexandre Riera	c121f184b6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5077-horaEnvio-ticketBasicData	2023-01-31 11:43:26 +01:00
Pau	136ad332b9	Merge branch 'dev' into 5148-logs-style	2023-01-31 10:36:17 +00:00
Alexandre Riera	1b12770655	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5072-comprobar-email-clientFiscalData	2023-01-31 11:31:01 +01:00
Alexandre Riera	ffdc539851	refs #5138 fix e2e	2023-01-31 11:29:07 +01:00
Alexandre Riera	ca967a7223	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5138-cambiarOrdenCampos-routeSummary	2023-01-31 11:15:46 +01:00
Alex Moreno	3f1020aebf	Merge pull request 'fix: e2e' (!1289) from fix_e2e_state_and_date into dev ... Reviewed-on: #1289 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-31 10:14:21 +00:00
Pau	ee10146e0f	Merge branch 'dev' into 5148-logs-style	2023-01-31 10:09:32 +00:00
Alex Moreno	62cd6ab0c9	Merge branch 'dev' into fix_e2e_state_and_date	2023-01-31 09:39:08 +00:00
Joan Sanchez	70d1e5f331	Merge pull request 'fixes #5074 ticket balance pone null' (!1284) from 5074-ticketBalance-null into dev ... Reviewed-on: #1284 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-01-31 09:38:21 +00:00
Alex Moreno	4740cdbbb9	fix: e2e	2023-01-31 10:37:18 +01:00
Alexandre Riera	7d617c0ac4	refs #5129 translations and userErrors added	2023-01-31 09:04:45 +01:00
Alexandre Riera	3f4bc83dd0	.	2023-01-31 09:00:37 +01:00
Joan Sanchez	18031dc5d2	Merge branch 'dev' into 5148-logs-style	2023-01-31 07:19:26 +00:00
Alexandre Riera	53349fcea7	refs #5104 changelog modified	2023-01-30 15:41:04 +01:00
Alexandre Riera	2bbd7cb217	refs #5104 changelog	2023-01-30 15:40:08 +01:00
Alexandre Riera	444d2ae4c4	refs #5104 grouping/packing unified	2023-01-30 15:28:47 +01:00
Alex Moreno	a74fb31b5b	fix: vn.time	2023-01-30 15:15:27 +01:00
Alexandre Riera	5a72398393	Merge branch 'dev' into 5074-ticketBalance-null	2023-01-30 14:01:17 +00:00
Alex Moreno	c990b9a564	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-30 14:37:24 +01:00
Vicent Llopis	e3504da800	Merge pull request 'fix: test e2e' (!1276) from fix_e2e_item.tags into dev ... Reviewed-on: #1276 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-30 13:36:08 +00:00
Vicent Llopis	e0dcbb6f2b	fix backTest	2023-01-30 14:32:39 +01:00