6114 Commits

Author	SHA1	Message	Date
Alexandre Riera	2363828092	hotfix clientUnpaid	2023-03-09 08:54:03 +01:00
Joan Sanchez	aeb50b2c19	Removed callback syntax	2023-03-08 10:19:02 +01:00
Juan Ferrer	47f1ad9a0c	Merge pull request 'master' (!1367) from master into test ... Reviewed-on: #1367	2023-03-06 08:28:29 +00:00
Juan Ferrer	99f8bc6bac	refs #5174 TpvTransaction.confirm code refator to improve debugging	2023-03-03 18:55:58 +01:00
Vicent Llopis	8ac575419a	fix: no mostraba la factura rectificada correcta	2023-03-03 12:31:20 +01:00
Juan Ferrer	73c988b18e	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-03-03 10:57:59 +01:00
Juan Ferrer	6eaf4bdd1b	refs #5174 tpvTransaction: Añadidas columnas para depuración	2023-03-03 10:57:57 +01:00
Alexandre Riera	de0e7334df	Merge branch 'master' into hotfix-itemWaste-openOtherTab	2023-03-03 07:55:28 +00:00
Alexandre Riera	d58a5eb1ff	hotfix itemWaste	2023-03-03 08:54:55 +01:00
Joan Sanchez	b8881a050c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-02 07:41:16 +01:00
Joan Sanchez	ee6d292d6a	Merge pull request 'fixes #5063 Añadir campo doPhoto en la ficha de Item' (!1264) from 5063-item-module-doPhoto into dev ... Reviewed-on: #1264 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-02 06:34:45 +00:00
Joan Sanchez	8834d4d0a4	Merge pull request 'fixes #5070 route-tickets city is now a link to buscaman' (!1282) from 5070-route-tickets-link-maps into dev ... Reviewed-on: #1282 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-02 06:33:03 +00:00
Joan Sanchez	baedb5b6ca	Merge pull request 'fixes #5202 item waste abrir en otra pestaña' (!1354) from 5202-itemWaste-openOtherTab into dev ... Reviewed-on: #1354 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-02 06:31:39 +00:00
Joan Sanchez	32b3284e40	Merge pull request 'refs #5115 transfer_sales' (!1344) from 5115-transfer_sales into dev ... Reviewed-on: #1344 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-02 06:31:20 +00:00
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
Alexandre Riera	d62fbab3f1	refs #5070 refactor and added tests	2023-03-01 14:22:25 +01: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
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
Alexandre Riera	7aedbda98b	refs #5202 changed vn-tr for a	2023-03-01 10:08:51 +01:00
Alexandre Riera	915c598c0c	fixed tests	2023-03-01 09:04:53 +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
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	4d6a770b26	Merge branch 'master' into hotfix-supplier-isTrucker	2023-02-28 13:39:45 +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
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	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	5d9220c5c0	refs #5287 locker added	2023-02-27 08:39:46 +01:00
Joan Sanchez	1bc715cde5	Updated claim state field	2023-02-24 14:32:56 +01:00
Alexandre Riera	698a3396fc	refs #5063 deleted changes in item hook	2023-02-24 10:40:24 +01:00
Alexandre Riera	9da3593dff	Merge branch '5063-item-module-doPhoto' of https://gitea.verdnatura.es/verdnatura/salix into 5063-item-module-doPhoto	2023-02-24 10:37:38 +01:00
Alexandre Riera	6d6fa11da1	refs #5063 fixed front test	2023-02-24 10:37:35 +01:00
Alexandre Riera	113b37e56f	Merge branch 'dev' into 5063-item-module-doPhoto	2023-02-24 09:25:44 +00:00
Alexandre Riera	afb14044cc	refs #5063 deleted item checked in image, added front test	2023-02-24 10:25:08 +01:00
Alexandre Riera	ed7f3f5d63	Merge branch 'dev' into 5172-cliente-impagado	2023-02-24 08:34:41 +00:00
Alexandre Riera	6a65c9f0e2	Merge branch 'dev' into 5168-mostrar-instanceLog	2023-02-24 08:22:45 +00:00
Alexandre Riera	4682497df9	Merge branch 'dev' into 5168-mostrar-instanceLog	2023-02-24 08:08:20 +00:00
Alex Moreno	bd225e6824	Merge branch 'dev' into 4998-claim_photos_back	2023-02-24 07:59:28 +00:00
Joan Sanchez	788e5488ae	Merge branch 'dev' into 5115-transfer_sales	2023-02-24 07:58:26 +00:00
Joan Sanchez	fafbfed189	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-02-24 07:23:38 +01:00