11736 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	91f111f609	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-04-13 11:33:49 +02:00
Carlos Jimenez Ruiz	8f15001440	Merge pull request '3897-item.fixed-price' (#940) from 3897-item.fixed-price into test ... Reviewed-on: #940 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-04-13 09:33:08 +00:00
Carlos Jimenez Ruiz	d84f882b36	Merge pull request '3830-ticket_sale' (#927) from 3830-ticket_sale into dev ... Reviewed-on: #927 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-04-13 09:30:47 +00:00
Carlos Jimenez Ruiz	9085098a04	Merge branch 'dev' into 3830-ticket_sale	2022-04-13 09:19:50 +00:00
Carlos Jimenez Ruiz	153b42cd26	Merge pull request '3758-client_unpaid' (#936) from 3758-client_unpaid into dev ... Reviewed-on: #936 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-04-13 09:19:27 +00:00
Carlos Jimenez Ruiz	6015050eed	Merge branch 'dev' into 3830-ticket_sale	2022-04-13 09:12:14 +00:00
Joan Sanchez	c2271b6071	Merge branch 'dev' into 3758-client_unpaid	2022-04-13 09:00:28 +00:00
Vicent Llopis	804f5f4b2f	fix: delete vn-focus and duplicated pagination	2022-04-13 10:37:52 +02:00
Carlos Jimenez Ruiz	f28631fa90	Merge pull request '2958-vnDescriptor_OpenSummaryPopup' (#934) from 2958-vnDescriptor_OpenSummaryPopup into dev ... Reviewed-on: #934 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-04-13 08:25:40 +00:00
Carlos Jimenez Ruiz	080975208b	Merge branch 'dev' into 2958-vnDescriptor_OpenSummaryPopup	2022-04-13 08:12:28 +00:00
Vicent Llopis	a47349646f	change versions db	2022-04-13 09:50:29 +02:00
Alex Moreno	32a065c07a	drop unnecessary locale	2022-04-13 08:21:00 +02:00
Alex Moreno	88d91d8b47	change db changes folder	2022-04-13 08:19:33 +02:00
Alex Moreno	14933d13cb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3758-client_unpaid	2022-04-13 08:17:44 +02:00
Vicent Llopis	013390fae9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3830-ticket_sale	2022-04-12 12:49:34 +02:00
Joan Sanchez	3d8f851de8	Added version	2022-04-12 11:46:14 +02:00
Joan Sanchez	2bc7b2db0c	Removed keep file	2022-04-12 10:15:30 +02:00
Alex Moreno	c9e8826627	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3758-client_unpaid	2022-04-12 07:08:55 +02:00
Carlos Jimenez Ruiz	3c93e69aa6	Merge pull request '3837 - Import data from external service' (#937) from 3837-edi_import into dev ... Reviewed-on: #937 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-04-11 14:14:04 +00:00
Joan Sanchez	7228394393	Merge branch 'dev' into 3837-edi_import	2022-04-11 12:43:52 +00:00
Joan Sanchez	99499b214e	Updated RocketChat unit tests	2022-04-11 14:43:20 +02:00
Joan Sanchez	255086c7e6	Removed package-lock.json	2022-04-11 13:42:50 +02:00
Joan Sanchez	4dd591e447	Renamed variable name	2022-04-11 13:38:49 +02:00
Carlos Jimenez Ruiz	a056a74e02	Merge pull request '3347-worker_basic-data' (#925) from 3347-worker_basic-data into dev ... Reviewed-on: #925 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-04-11 11:02:14 +00:00
Carlos Jimenez Ruiz	018047b6be	Merge branch 'dev' into 3347-worker_basic-data	2022-04-11 10:52:56 +00:00
Carlos Jimenez Ruiz	5426445451	Merge pull request '3802-ticket_sale_mana' (#924) from 3802-ticket_sale_mana into dev ... Reviewed-on: #924 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-04-11 10:50:17 +00:00
Carlos Jimenez Ruiz	56e52c35d8	Merge branch 'dev' into 3802-ticket_sale_mana	2022-04-11 10:40:52 +00:00
Carlos Jimenez Ruiz	eddbe85ca9	Merge pull request '3605-invoiceIn_intrastat3' (#921) from 3605-invoiceIn_intrastat3 into dev ... Reviewed-on: #921 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-04-11 10:40:16 +00:00
Carlos Jimenez Ruiz	b087d275dc	Merge branch 'dev' into 3605-invoiceIn_intrastat3	2022-04-11 10:29:01 +00:00
Joan Sanchez	fb514c21d6	Removed model ACL	2022-04-11 12:11:59 +02:00
Joan Sanchez	39d18093eb	Updated SQL files	2022-04-11 12:04:34 +02:00
Joan Sanchez	47a2f76aa4	3837 - Import data from external service	2022-04-11 11:58:40 +02:00
Vicent Llopis	fefff80af4	pull request changes	2022-04-11 10:01:15 +02:00
Vicent Llopis	d88a404ce6	refactor: pull request changes	2022-04-11 10:01:00 +02:00
Vicent Llopis	a348762153	refactor: pull request changes	2022-04-11 09:09:05 +02:00
Vicent Llopis	655db502f7	refactor: pull request changes	2022-04-11 09:04:05 +02:00
Vicent Llopis	d8a1bd1b1c	fix: pull request changes	2022-04-11 08:23:54 +02:00
Alex Moreno	786b7fa84f	feat(descriptor): button open summary popup	2022-04-11 08:02:05 +02:00
Alex Moreno	c7b8b61a08	feat(item): add model itemPackingType	2022-04-08 10:34:36 +02:00
Joan Sanchez	321d684f34	Merge pull request '3756-client_address_isLogifloraAllowed' (#930) from 3756-client_address_isLogifloraAllowed into dev ... Reviewed-on: #930 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-04-08 07:49:43 +00:00
Joan Sanchez	b93f44b220	Merge branch 'dev' into 3756-client_address_isLogifloraAllowed	2022-04-08 07:29:00 +00:00
Joan Sanchez	d2adee3cce	Merge pull request '3863-feat(client.defaulter&claim): change socialName to name' (#933) from 3863-client_name into dev ... Reviewed-on: #933 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-04-08 07:13:10 +00:00
Joan Sanchez	d2ecbe898e	Merge branch 'dev' into 3863-client_name	2022-04-08 07:03:23 +00:00
Alex Moreno	90a19d52fb	use variable	2022-04-08 09:02:27 +02:00
Alex Moreno	8c2bc76b88	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3756-client_address_isLogifloraAllowed	2022-04-08 09:01:38 +02:00
Joan Sanchez	07a1388a94	Merge pull request '3832-client_balance_create' (#931) from 3832-client_balance_create into dev ... Reviewed-on: #931 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-04-08 06:57:02 +00:00
Alex Moreno	238a9fd5da	feat(client.defaulter&claim): change socialName to name	2022-04-08 08:52:21 +02:00
Joan Sanchez	8414f94cf6	Merge pull request '3736-worker-timeControl_calculate' (#926) from 3736-worker-timeControl_calculate into dev ... Reviewed-on: #926 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-04-08 06:49:39 +00:00
Joan Sanchez	a11bcd3669	Merge branch 'dev' into 3832-client_balance_create	2022-04-08 06:48:46 +00:00
Joan Sanchez	639930c649	Merge pull request '3043-feat(client_search-panel): filter by province' (#929) from 3043-client_search-panel into dev ... Reviewed-on: #929 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-04-08 06:48:22 +00:00