946 Commits

Author	SHA1	Message	Date
Vicent Llopis	9bcfebcae6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing	2022-11-09 07:26:56 +01:00
Joan Sanchez	92a2367db2	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-11-07 10:52:53 +01:00
Joan	be1fbc4d68	Added version 10502	2022-11-07 10:49:17 +01:00
Joan	17d6308126	Already on prod	2022-11-07 10:48:38 +01:00
Alex Moreno	c3ee9da6c6	hotFix: force apply changes	2022-11-07 10:18:32 +01:00
Joan Sanchez	1bcde47ab1	Merge pull request '3951-invoiceOut.index_downloadPdfs' (!1110) from 3951-invoiceOut.index_downloadPdfs into dev ... Reviewed-on: #1110 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-04 10:42:32 +00:00
Joan Sanchez	2afb47fe14	Added version 10501 - November	2022-11-04 10:01:23 +01:00
Vicent Llopis	ae513fb2b3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing	2022-11-04 09:12:16 +01:00
Vicent Llopis	b6d3a08871	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3951-invoiceOut.index_downloadPdfs	2022-11-03 10:17:46 +01:00
Alex Moreno	67697784cd	Merge branch 'dev' into 4548-invoiceIn-pdf	2022-11-03 06:48:38 +00:00
Vicent Llopis	35c50cb314	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3951-invoiceOut.index_downloadPdfs	2022-11-03 07:11:54 +01:00
Vicent Llopis	f96fc0f91e	Merge branch 'dev' into 3852-client.search-panel2	2022-11-02 14:13:41 +00:00
Vicent Llopis	8c4e70c11d	Merge branch 'dev' into 3095-item.shelving	2022-11-02 14:06:06 +00:00
Vicent Llopis	3cc89c170c	Merge branch 'dev' into 3811-ticket.sale_updatePrice	2022-11-02 13:55:07 +00:00
Alex Moreno	943103c254	Merge branch 'dev' into 4548-invoiceIn-pdf	2022-11-02 13:33:45 +00:00
Alex Moreno	c1ed0f2226	Merge branch 'dev' into changesInCorrectFolder	2022-11-02 12:58:32 +00:00
Alex Moreno	2c3b735650	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf	2022-11-02 13:49:09 +01:00
Alex Moreno	2a8a8ed84a	Merge branch 'dev' into 4146-claim_pickup_order	2022-11-02 12:01:11 +00:00
Joan Sanchez	34997b72f5	Merge branch 'dev' into 3811-ticket.sale_updatePrice	2022-11-02 11:55:47 +00:00
Joan Sanchez	e2101db706	Merge branch 'dev' into 4155-close_tickets_fix2	2022-11-02 11:53:47 +00:00
Joan Sanchez	2fba17ab15	Merge branch 'dev' into 4548-invoiceIn-pdf	2022-11-02 09:33:27 +00:00
Joan Sanchez	fe3ebe8e0c	Merge branch 'dev' into 3095-item.shelving	2022-11-02 06:43:43 +00:00
Joan Sanchez	33c92a0f24	Merge pull request '4563-Worker-Description-workerDisableExcluded-checkbox' (!1076) from 4563-Worker-Description-workerDisableExcluded-checkbox into dev ... Reviewed-on: #1076 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-02 06:34:49 +00:00
Alex Moreno	a7b1ee85fe	fix changes folder	2022-11-02 07:27:57 +01:00
Alex Moreno	e9731c4ac0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order	2022-10-28 09:11:40 +02:00
Vicent Llopis	264b56378a	Merge branch 'dev' into 4155-close_tickets_fix2	2022-10-28 06:31:12 +00:00
Alex Moreno	9eb3b09be1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-10-28 08:26:45 +02:00
Alex Moreno	80617dd578	Merge branch 'dev' into 4320-notificationQueue	2022-10-28 05:33:45 +00:00
Alex Moreno	9225e8f176	fix tests	2022-10-27 15:11:57 +02:00
Vicent Llopis	fa89d1f944	fix: comentario corregido	2022-10-26 13:10:50 +02:00
Vicent Llopis	65e32f5e7f	feat: client search panel add find by zone	2022-10-26 12:40:13 +02:00
Vicent Llopis	350c516bb1	feat: cancelar petición cuando esta calculando el packaging	2022-10-26 10:36:41 +02:00
Vicent Llopis	3110172c54	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3811-ticket.sale_updatePrice	2022-10-26 08:39:58 +02:00
Vicent Llopis	5e0f976ad2	Merge branch 'dev' into 4155-close_tickets_fix2	2022-10-26 06:25:18 +00:00
Vicent Llopis	07a18dc736	delete sql	2022-10-26 08:05:11 +02:00
Alex Moreno	607e9010e6	Merge branch 'dev' into 4075-ticket_boxing	2022-10-25 12:36:35 +00:00
Joan Sanchez	4334907d91	fix(database): updated sql files	2022-10-25 14:09:21 +02:00
Alex Moreno	ac8c4b8ef0	Merge branch 'dev' into 4075-ticket_boxing	2022-10-25 10:39:50 +00:00
Pau	7b04464848	Merge branch 'dev' into 2612-create-supplier	2022-10-25 10:00:13 +00:00
Joan Sanchez	1196125350	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-10-25 11:58:47 +02:00
Alex Moreno	3fd10dfc64	Merge branch 'dev' into 4075-ticket_boxing	2022-10-25 09:58:17 +00:00
Pau	76d248131c	Merge branch 'dev' into 2612-create-supplier	2022-10-25 09:45:25 +00:00
Pau	9089ba7346	requested changes	2022-10-25 10:42:16 +02:00
Pau	23598c993b	Change ACL from employee to hr	2022-10-25 09:25:15 +02:00
Vicent Llopis	7f1dd801a5	refactor: change ACLs	2022-10-25 07:56:17 +02:00
Alex Moreno	7cb8175b73	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf	2022-10-25 07:36:21 +02:00
Vicent Llopis	d18b22bb05	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving	2022-10-25 07:05:26 +02:00
Joan Sanchez	e80754f280	Added new SQL version	2022-10-24 18:37:38 +02:00
Alex Moreno	9e0eab5a77	feat(invoiceIn): email	2022-10-24 15:15:23 +02:00
Vicent Llopis	c77999871e	refs #3951	2022-10-24 14:34:17 +02:00