1697 Commits

Author	SHA1	Message	Date
Vicent Llopis	b1be6addd1	fix: delete unnecessary code	2023-01-20 12:16:06 +01:00
Alexandre Riera	98d6322b0e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5020-borradoLogico-IPT	2023-01-18 08:00:20 +01:00
Pau	3a1aea2afd	Merge branch 'dev' into 4605-Create-Model-PackagingMistake	2023-01-17 09:01:45 +00:00
Alexandre Riera	c47cac7d55	refs #5020 isActive column added, filter in front	2023-01-17 08:54:26 +01:00
Alexandre Riera	fea76f29e7	Merge branch 'dev' into 4866-detalle-faltas	2023-01-17 07:31:45 +00:00
Alexandre Riera	4d12e29b3d	refs #5061 fix filter	2023-01-16 14:24:53 +01:00
Alexandre Riera	b78bebf27c	refs #5061 added hour in date, changed ipt filter	2023-01-16 12:22:22 +01:00
Pau	34508425a9	Merge branch 'dev' into 4605-Create-Model-PackagingMistake	2023-01-16 07:08:19 +00:00
Pau	05dfcfd864	Merge branch '4605-Create-Model-PackagingMistake' of https://gitea.verdnatura.es/verdnatura/salix into 4605-Create-Model-PackagingMistake	2023-01-13 15:42:02 +01:00
Pau	a8e4c9e1de	cambiar fks por relaciones	2023-01-13 15:42:00 +01:00
Alex Moreno	9a3fea99ae	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4839-docuware_send	2023-01-13 13:45:10 +01:00
Alex Moreno	def41c011c	feat(docuware_upload): send to trash last file	2023-01-13 13:33:59 +01:00
Joan Sanchez	c489c4c6a9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-01-13 08:55:01 +01:00
Alex Moreno	5bb66fec3f	test(docuware): back tests	2023-01-12 15:16:38 +01:00
Pau	d5a7691b9c	add controller function	2023-01-12 12:56:51 +01:00
Pau	b6de50848a	refs #5081 fix sms faltas	2023-01-12 11:48:44 +01:00
Joan Sanchez	882cf6b9c1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-01-12 08:36:24 +01:00
Alex Moreno	c2f4648b5c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4839-docuware_send	2023-01-12 07:54:09 +01:00
Alex Moreno	9f324483d6	refactor(docuware): only use axios and refactor all	2023-01-11 15:19:09 +01:00
Pau	30524e382b	Merge branch 'dev' into 4605-Create-Model-PackagingMistake	2023-01-11 09:23:40 +00:00
Alex Moreno	b8fe919b2a	feat(docuware): upload deliveryNote file	2023-01-10 15:03:23 +01:00
Pau	4f2472ea90	Merge branch 'dev' into 4605-Create-Model-PackagingMistake	2023-01-10 13:56:15 +01:00
Pau	d540e278eb	refs #4605 @30min	2023-01-10 13:52:30 +01:00
Alex Moreno	382aad2622	feat(docuware): upload and send pdf	2023-01-09 15:11:53 +01:00
Alex Moreno	46f36e1de1	try	2023-01-04 15:03:45 +01:00
Vicent Llopis	415fa04e3b	refs #2952 feat: add chips	2023-01-03 13:06:30 +01:00
Vicent Llopis	fa58ac2462	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked	2023-01-03 09:13:47 +01:00
Vicent Llopis	d5b626434b	refactor: add translations, change css...	2022-12-28 12:42:51 +01:00
Vicent Llopis	ab0af27f8b	refactor: delete changes in ticket.sale-checked	2022-12-28 12:23:41 +01:00
Vicent Llopis	d0ae97e41b	refactor: move changes from ticket.sale-checked to ticket.sale-tracking	2022-12-28 12:16:23 +01:00
Alexandre Riera	30197e9e15	Merge branch 'dev' into 4866-detalle-faltas	2022-12-28 09:07:26 +00:00
Vicent Llopis	3dd0c79629	feat: add ItemShelvingSales/filter	2022-12-27 15:00:49 +01:00
Alexandre Riera	c06c3dc6a7	refs #4957 saleChecked deleted	2022-12-27 11:50:58 +01:00
Pau	1c1cc93ef4	Merge branch 'master' into Hotfix-crear-report-Factura-Electronica	2022-12-26 06:18:47 +00:00
Vicent Llopis	d3a9e9ac89	delete: columnas que ya no existen en la tabla	2022-12-23 12:17:24 +01:00
Vicent Llopis	16c20e4700	feat: add itemShelvingSale popup	2022-12-23 12:08:16 +01:00
Vicent Llopis	682b6d8961	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked	2022-12-23 09:59:21 +01:00
Joan Sanchez	93c98e05fc	fix(discount): handle error for a worker without business contract	2022-12-23 08:27:03 +01:00
Alexandre Riera	aec22fad9d	Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas	2022-12-23 08:16:36 +01:00
Vicent Llopis	8880a83b89	feat: añadido saleTracking	2022-12-21 15:03:41 +01:00
Vicent Llopis	06075aa17b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4804-ticket.descriptor_sms	2022-12-21 12:15:21 +01:00
Vicent Llopis	3a33750890	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked	2022-12-21 10:11:37 +01:00
Alexandre Riera	081ef7fc99	Merge branch 'dev' into 3963-ticket-advance	2022-12-21 07:30:17 +00:00
Pau	c9b4e1ab9a	Merge branch 'dev' into 4791-refactor-sendsms	2022-12-21 06:38:20 +00:00
Vicent Llopis	799c26796e	feat: añadidos chips	2022-12-20 15:19:05 +01:00
Pau	90b36bf1ab	Fix missing report for the invoice electronic notification	2022-12-20 14:21:01 +01:00
Alexandre Riera	62152d1668	Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas	2022-12-20 12:16:40 +01:00
Alexandre Riera	721123381c	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-12-20 11:54:22 +01:00
Alexandre Riera	4c6a735235	refs #4962 moved sql and methods to ticket	2022-12-20 11:53:54 +01:00
Alexandre Riera	8403af7db5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour	2022-12-20 11:37:40 +01:00