6313 Commits

Author	SHA1	Message	Date
Vicent Llopis	0396d3707c	refator: creada ruta de back, en vez de hacer peticiones http anidadas en el front	2023-03-08 11:47:10 +01:00
Joan Sanchez	4d2d75e066	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-08 10:19:11 +01:00
Joan Sanchez	aeb50b2c19	Removed callback syntax	2023-03-08 10:19:02 +01:00
Vicent Llopis	760690a625	fix: test front	2023-03-08 09:51:21 +01:00
Carlos Satorres	3d1f640e08	refs #5380 m3Max add and mod itemMaxSize	2023-03-08 09:19:57 +01:00
Alexandre Riera	741dd921d2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos	2023-03-08 07:48:11 +01:00
Joan Sanchez	c93d3f8846	Updated front unit test	2023-03-08 07:47:25 +01:00
Javi Gallego	bb691ccf1d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-08 07:45:25 +01:00
Javi Gallego	98c8cd67e5	minor bug	2023-03-08 07:45:22 +01:00
Joan Sanchez	9050c06994	Updated unit test	2023-03-08 07:44:56 +01:00
Alexandre Riera	59a3ff0f7b	Merge branch 'dev' into 5036-regularizar-historicos	2023-03-07 12:10:24 +00:00
Alexandre Riera	21c7b18de9	refs #5036 make logs/querys only when grabUser is disabled	2023-03-07 13:10:02 +01:00
Joan Sanchez	3ad96b6ad7	Endpoint fixes	2023-03-07 11:55:13 +01:00
Joan Sanchez	445a0b0e1f	Claim fixes	2023-03-07 10:20:10 +01:00
Joan Sanchez	44e7abd6d3	Merge pull request 'feat(claimLog): added claim log section' (!1370) from 5340-claim_log into dev ... Reviewed-on: #1370 Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>	2023-03-07 08:28:13 +00:00
Vicent Llopis	0bda8c0ed6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2023-03-07 09:14:30 +01:00
Joan Sanchez	bc0a6c33c4	Merge branch 'dev' into 5187-error-permisos	2023-03-06 13:50:21 +00:00
Joan Sanchez	9f4aed7d83	Updated unit test	2023-03-06 13:44:03 +01:00
Vicent Llopis	a98bb59479	fix: test front	2023-03-06 12:47:49 +01:00
Joan Sanchez	4f091330a7	feat(claimLog): added claim log section ... Refs: #5340	2023-03-06 12:37:37 +01:00
Vicent Llopis	9e9807c4b5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control	2023-03-06 11:55:30 +01:00
Vicent Llopis	e39690c2c9	merge with dev	2023-03-06 10:21:10 +01:00
Vicent Llopis	5248fd7fcf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2023-03-06 10:20:57 +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
Javi Gallego	780572a9f2	test fixed	2023-03-06 08:14:26 +01:00
Juan Ferrer	99f8bc6bac	refs #5174 TpvTransaction.confirm code refator to improve debugging	2023-03-03 18:55:58 +01:00
Vicent Llopis	497d756af6	fix: autocompletar el switf/bic	2023-03-03 13:46:18 +01:00
Vicent Llopis	727ae1d4e0	Merge branch 'dev' into 5035-intermittent_backTest2	2023-03-03 12:11:28 +00: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
Vicent Llopis	7c24b940b3	feat: colorea los numeros de la semana al inicio y cada vez que canvias de mes	2023-03-02 14:55:18 +01:00
Javi Gallego	e01fa40531	Merge branch 'dev' into 5187-error-permisos	2023-03-02 11:51:41 +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
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	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
Carlos Andrés	6f5e25493d	invoicing test	2023-03-01 10:36:38 +01: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	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	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
Alexandre Riera	76cd2d160e	Merge branch 'dev' into 5036-regularizar-historicos	2023-02-27 06:05:21 +00:00
Alexandre Riera	2a4d41cbca	refs #4632 saveSign refactored, working on tests, check if dmsRecover is needed	2023-02-24 14:41:02 +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
Alexandre Riera	6590c6f1fa	refs #5036 transferSales also transfer sale's logs	2023-02-24 08:55:04 +01:00
Joan Sanchez	fafbfed189	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-02-24 07:23:38 +01:00
Alexandre Riera	bca9e757d4	hotfix parsed description array to string	2023-02-23 15:52:47 +01:00
Carlos Andrés	ffdfd1a7e5	refs #5000 Invoicing change structure	2023-02-23 14:48:21 +01:00
Vicent Llopis	9b11987d75	feat: desaparecen los botones para las semanas que no tienen registros	2023-02-23 14:33:38 +01:00
Vicent Llopis	475bc2c255	feat: solo puede dar conforme/no confome el propio usuario	2023-02-23 14:33:16 +01:00
Robert Ferrús	1e23dfe34e	Merge branch 'dev' into 5115-transfer_sales	2023-02-23 10:00:32 +00:00
Vicent Llopis	9310e92223	refactor	2023-02-23 10:44:08 +01:00
Carlos Andrés	7f60335a91	refs #5000 Invoicing: front tests refactor & fixes	2023-02-23 09:45:15 +01:00
Carlos Andrés	4cc6485cbd	refs #5000 Invoicing RC	2023-02-23 09:25:23 +01:00
Carlos Andrés	eaa5b4530a	getMinClientId	2023-02-23 09:22:17 +01:00
Vicent Llopis	35b47c6da2	refactor code	2023-02-23 08:21:59 +01:00
Vicent Llopis	05d91ed50e	feat: actualizada interfaz	2023-02-22 15:12:25 +01:00
Alex Moreno	8597497429	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4998-claim_photos_back	2023-02-22 14:31:31 +01:00
Vicent Llopis	a93fb2c69f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control	2023-02-22 14:29:29 +01:00
Alexandre Riera	3a3dcc941b	Merge branch '5172-cliente-impagado' of https://gitea.verdnatura.es/verdnatura/salix into 5172-cliente-impagado	2023-02-22 14:24:33 +01:00
Alexandre Riera	0263a4833e	refs #5172 added changelog	2023-02-22 14:24:31 +01:00
Alexandre Riera	ca1f5480ae	refs #5235 added setClientSample(), fixed tests	2023-02-22 13:04:27 +01:00
Alexandre Riera	42b8f08a4d	refs #5168 checked sales with logs	2023-02-22 12:14:17 +01:00
Alexandre Riera	be8d19a9f8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos	2023-02-22 09:27:38 +01:00
Vicent Llopis	c8c48ea175	feat: colorar numeros de semanas segun el registro de horas	2023-02-21 15:16:28 +01:00
Joan Sanchez	3d8add4d6f	Merge branch 'dev' into 5192-db_export	2023-02-21 13:12:27 +00:00
Joan Sanchez	0d16f71fd3	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-02-21 14:10:36 +01:00
Vicent Llopis	c30242f9cc	fix: front test	2023-02-21 12:17:16 +01:00
Vicent Llopis	eda70b009b	fix: cuando haces F5 en cualquier sección que no sea Diary, te coge el warehouse por defecto	2023-02-21 11:48:56 +01:00
Vicent Llopis	432c8a9ab8	refactor: cambiados estilos de los chips	2023-02-21 10:56:46 +01:00
Joan Sanchez	58548164d2	Merge branch 'dev' into 5192-db_export	2023-02-21 09:20:30 +00:00
Joan Sanchez	4c2878e232	Updated unit tests	2023-02-21 09:48:47 +01:00
Joan Sanchez	45c4f2ff45	Updated test	2023-02-21 08:51:50 +01:00
Joan Sanchez	c9840f6985	Updated entry structure	2023-02-21 08:32:46 +01:00
Alex Moreno	cc5a867bf4	feat(claim_model): add claimDms relations	2023-02-20 15:16:19 +01:00
Alexandre Riera	063c60b4a1	Merge branch 'dev' into 5172-cliente-impagado	2023-02-20 13:58:31 +00:00
Joan Sanchez	ab6ca12862	Merge branch 'dev' into 5266-image_fixes	2023-02-20 13:15:40 +00:00
Vicent Llopis	0b240e7925	add console.log	2023-02-20 13:35:50 +01:00
Alexandre Riera	271a6d898d	Merge branch 'dev' into 5063-item-module-doPhoto	2023-02-20 12:17:03 +00:00
Alexandre Riera	04877c1425	refs #5063 refactor hook	2023-02-20 13:15:47 +01:00
Joan Sanchez	90e1136ee2	fix(image): store images with a name generated through uuid instead of url path ... Refs: #5266	2023-02-20 12:40:13 +01:00
Vicent Llopis	26d72a7b3f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5180-invoice-out_refund	2023-02-20 11:49:17 +01:00
Alexandre Riera	c7f22a10ba	refs #5063 refactored hook	2023-02-20 10:39:12 +01:00
Alexandre Riera	5c2c99e397	refs #5172 changed icon name	2023-02-20 09:44:14 +01:00
Alexandre Riera	77066b2005	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos	2023-02-20 09:20:30 +01:00
Alexandre Riera	08476fe2a6	Merge branch 'dev' into 5063-item-module-doPhoto	2023-02-17 13:30:47 +00:00
Joan Sanchez	86dd299292	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-02-17 13:33:52 +01:00
Joan Sanchez	ceab11cc41	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-02-17 13:33:34 +01:00
Vicent Llopis	39a3c8a7fa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies	2023-02-17 13:06:30 +01:00
Vicent Llopis	853e06f523	fix: card reload automatic	2023-02-17 12:38:07 +01:00
Joan Sanchez	527caf9ca0	refactor(zerofill): deprecated zerofill and removed function ... Refs: #5207	2023-02-17 11:19:35 +01:00
Vicent Llopis	373be40986	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies	2023-02-17 10:42:50 +01:00
Vicent Llopis	4001a75916	Merge branch 'dev' into 5180-invoice-out_refund	2023-02-17 08:57:48 +00:00
Vicent Llopis	874f459956	refactor: borrada variable innecesaria	2023-02-17 09:49:47 +01:00
Vicent Llopis	885a98457e	feat: sustido sql por loopback del report 'balance-compensation'	2023-02-17 09:11:20 +01:00
Alexandre Riera	8b088e831a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance	2023-02-16 14:43:51 +01:00
Vicent Llopis	b5d2d53435	fix: test back	2023-02-16 10:45:13 +01:00
Vicent Llopis	3096738b84	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5180-invoice-out_refund	2023-02-16 09:52:18 +01:00
Vicent Llopis	3dd870f7df	fix: test e2e	2023-02-16 09:44:20 +01:00
Vicent Llopis	bb2eddc462	fix: test front	2023-02-16 07:32:44 +01:00
Vicent Llopis	73ae45c2c0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available	2023-02-15 15:08:58 +01:00
Alexandre Riera	dca5ae0f72	refs #5223 added params	2023-02-15 13:14:52 +01:00
Vicent Llopis	443118a7ac	esto se debe BORRAR	2023-02-15 12:37:31 +01:00
Vicent Llopis	7439b12d98	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies	2023-02-15 09:31:20 +01:00
Vicent Llopis	df38f30f74	se incluyen los test intermintents que estaban incluidos	2023-02-15 09:10:55 +01:00
Alexandre Riera	ea2fd59cdc	refs #5223 changed ref and email text	2023-02-14 12:41:36 +01:00
Vicent Llopis	a5a0256e44	feat: añadido parametro que indica si genera uno o multiples ticket de abono	2023-02-14 10:58:41 +01:00
Pau	6a732819ba	Merge branch 'dev' into 5063-item-module-doPhoto	2023-02-14 09:58:10 +00:00
Alexandre Riera	b1a6713a3d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4588-campo-nota-ultimo-usuario	2023-02-14 09:04:08 +01:00
Alexandre Riera	139dac0bc1	refs #4588 moved hook from entryObservation to entry	2023-02-14 08:08:48 +01:00
Alexandre Riera	e5e86de8d2	Merge branch 'dev' into 5152-ticketBasicData-stepTwo	2023-02-14 07:07:12 +00:00