15026 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	84dc95621d	Merge pull request 'fixes #5149 ticket.descriptor-menu Eliminar ticket, debe comprobar que no existe un abono' (!1348) from 5149-check-ticket.refund into dev ... Reviewed-on: #1348 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-02 06:30:17 +00:00
Joan Sanchez	d819a13597	Merge pull request '5240-ticket.sale-tracking' (!1353) from 5240-ticket.sale-tracking into dev ... Reviewed-on: #1353 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-02 06:28:01 +00:00
Joan Sanchez	bc30fffc2d	Merge pull request 'refs #5193 ticketCreateWithUser to ticket_add' (!1358) from 5193-ticketCreateWithUser__ into dev ... Reviewed-on: #1358 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-02 06:25:02 +00:00
Joan Sanchez	cbb8908af6	Merge pull request 'refs #4965 Hotfix' (!1360) from 4965-hotfix into master ... Reviewed-on: #1360	2023-03-02 06:22:38 +00:00
Vicent Llopis	3051768781	WIP: 9b11987d7 feat: desaparecen los botones para las semanas que no tienen registros	2023-03-01 14:50:23 +01:00
Alexandre Riera	d62fbab3f1	refs #5070 refactor and added tests	2023-03-01 14:22:25 +01:00
Vicent Llopis	bc542d8a40	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control	2023-03-01 14:11:12 +01:00
Guillermo Bonet	a5d236257b	refs #4965 Hotfix	2023-03-01 14:03:47 +01:00
Guillermo Bonet	8e79ad2f50	Merge pull request 'refs #4965 Hotfix collection-label' (!1359) from hotfixCollectionLabel into master ... Reviewed-on: #1359	2023-03-01 12:07:16 +00:00
Guillermo Bonet	fdf97b1fc7	refs #4965 Hotfix collection-label	2023-03-01 12:59:46 +01:00
Alexandre Riera	ab8c3b3f67	Merge pull request 'hotFix itemDiary reload card conditional' (!1357) from hotFix-itemDiary-reloadCardConditional into master ... Reviewed-on: #1357	2023-03-01 11:38:42 +00:00
Guillermo Bonet	707ae232a7	refs #5193 ticketCreateWithUser to ticket_add	2023-03-01 12:24:36 +01:00
Alexandre Riera	cd026d79c3	Merge branch 'master' into hotFix-itemDiary-reloadCardConditional	2023-03-01 11:22:41 +00:00
Alexandre Riera	d744cbb1a3	hotFix itemDiary reload card conditional	2023-03-01 12:22:01 +01:00
Vicent Llopis	2f9e9ada43	Merge branch 'dev' into 5240-ticket.sale-tracking	2023-03-01 10:58:49 +00:00
Carlos Satorres	1c3aa29642	refs #5090 model.ezp nuevo	2023-03-01 11:56:41 +01:00
Carlos Satorres	968f422054	refs #5090 Renamed QLabel to GoLabel	2023-03-01 11:43:07 +01:00
Alexandre Riera	48da6403fa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5070-route-tickets-link-maps	2023-03-01 11:20:24 +01:00
Carlos Andrés	6f5e25493d	invoicing test	2023-03-01 10:36:38 +01:00
Alexandre Riera	c47f64519d	Merge pull request 'fixes #5160 Error Test Back Jenkins' (!1355) from 5160-testsBack-jenkins into dev ... Reviewed-on: #1355 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-03-01 09:31:11 +00:00
Alexandre Riera	680d0ba0a1	Merge branch 'dev' into 5160-testsBack-jenkins	2023-03-01 09:18:24 +00:00
Vicent Llopis	01519ec0fb	Merge pull request '4849-supplier-isVies' (!1329) from 4849-supplier-isVies into dev ... Reviewed-on: #1329 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2023-03-01 09:17:45 +00:00
Alexandre Riera	7aedbda98b	refs #5202 changed vn-tr for a	2023-03-01 10:08:51 +01:00
Vicent Llopis	4567981724	add console.log	2023-03-01 09:09:09 +01:00
Alexandre Riera	314c5c27eb	refs #5149 changelog	2023-03-01 09:09:05 +01:00
Alexandre Riera	915c598c0c	fixed tests	2023-03-01 09:04:53 +01:00
Vicent Llopis	f6afed485c	add console.log	2023-03-01 08:50:30 +01:00
Vicent Llopis	07784ffbfa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5035-intermittent_backTest2	2023-03-01 08:46:26 +01:00
Alexandre Riera	fb940fff52	.	2023-03-01 08:31:45 +01:00
Alexandre Riera	2e09845dbd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5149-check-ticket.refund	2023-03-01 08:29:58 +01:00
Vicent Llopis	8a1a7d7159	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5240-ticket.sale-tracking	2023-03-01 08:20:28 +01:00
Alexandre Riera	6eab4bbe94	refs #5149 fixing tests	2023-03-01 08:15:58 +01:00
Vicent Llopis	da6e29056e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies	2023-03-01 08:08:23 +01:00
Alexandre Riera	d2e7526a09	Merge pull request 'hotfix isTrucker was not in the params' (!1350) from hotfix-supplier-isTrucker into master ... Reviewed-on: #1350	2023-02-28 13:58:02 +00:00
Guillermo Bonet	15f2f46e4c	refs #4975 Traduction no branch	2023-02-28 14:48:17 +01:00
Alexandre Riera	4d6a770b26	Merge branch 'master' into hotfix-supplier-isTrucker	2023-02-28 13:39:45 +00:00
Guillermo Bonet	3afdee9a75	Merge pull request '4975-mdbUploadFixes' (!1349) from 4975-mdbUploadFixes into master ... Reviewed-on: #1349	2023-02-28 13:39:25 +00:00
Alexandre Riera	3dd6232d6a	hotfix isTrucker was not in the params	2023-02-28 14:39:01 +01:00
Guillermo Bonet	656685cd7e	refs #4975 Minor changes	2023-02-28 14:35:34 +01:00
Alexandre Riera	b2bf7f2727	refs #5149 fixing e2e	2023-02-28 14:29:31 +01:00
Alexandre Riera	85b1ca4a02	Merge pull request 'fixes #5287 Añadir campo Locker (Taquilla) en Worker/Basic Data y crear nueva sección Worker/PDA' (!1347) from 5287-worker-locker-pda into dev ... Reviewed-on: #1347 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-02-28 12:55:35 +00:00
Juan Ferrer	9336d20e45	refs #4975 MdbVersion/upload fixes & code clean	2023-02-28 13:45:36 +01:00
Alexandre Riera	e9dca9211c	refs #5149 checked if ticket has refunds, added translations	2023-02-28 13:42:18 +01:00
Alexandre Riera	d5ea59e284	refs #5287 permisos añadidos	2023-02-28 12:46:48 +01:00
Alexandre Riera	5ccfe6bf90	refs #5160 callback added	2023-02-28 11:19:41 +01:00
Alexandre Riera	96e103d76e	refs #5287 sections sorted	2023-02-28 08:37:17 +01:00
Alexandre Riera	7a04b0b3de	refs #5287 icon added	2023-02-28 08:00:18 +01:00
Alexandre Riera	94901d5b1f	refs #5287 pda section added, tests added	2023-02-28 07:49:34 +01:00
Alexandre Riera	5b7306a9ca	refs #5287 f describe	2023-02-27 08:41:27 +01:00
Alexandre Riera	5d9220c5c0	refs #5287 locker added	2023-02-27 08:39:46 +01:00