17401 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	77b55e5b09	refs #6210 Minor change	2023-09-19 12:15:23 +02:00
Guillermo Bonet	661563a2b6	refs #6210 Refactor filter client (zoneFk)	2023-09-19 12:14:55 +02:00
Carlos Satorres	9524ff6932	refs #5660 fix sql	2023-09-19 11:02:12 +02:00
Alex Moreno	32d5c80e92	Merge branch '5673-claim-development' of https://gitea.verdnatura.es/verdnatura/salix into 5673-claim-development	2023-09-18 13:49:47 +02:00
Alex Moreno	3d1ee374c2	refs #5673 feat: remove claim_development e2e	2023-09-18 13:49:45 +02:00
Alex Moreno	656492b9a6	Merge branch 'dev' into 5673-claim-development	2023-09-18 10:40:26 +00:00
Carlos Satorres	b6e0b6ac8a	Merge branch '5660-changeRolDeliveryAssistant' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant	2023-09-18 12:24:29 +02:00
Carlos Satorres	63068ddfb8	refs #5660 call and insert	2023-09-18 12:24:26 +02:00
Carlos Satorres	cfd080530a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant	2023-09-18 11:49:03 +02:00
Alex Moreno	6a33a15765	Merge branch 'dev' into 5660-changeRolDeliveryAssistant	2023-09-18 08:11:34 +00:00
Guillermo Bonet	6c34421413	refs #5995 Requested changes	2023-09-18 10:03:31 +02:00
Guillermo Bonet	a6b730ecc2	Merge branch 'test' into dev	2023-09-18 09:54:33 +02:00
Guillermo Bonet	4c5b97d448	Merge branch 'master' into test	2023-09-18 09:54:04 +02:00
Guillermo Bonet	73b79ed7b2	Merge pull request 'refs #5684 Fixed no error' (!1751) from 5684-updateDataHandledError into master ... Reviewed-on: #1751 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-18 07:50:01 +00:00
Carlos Satorres	fa87757d0f	refs #5560 sql fix	2023-09-18 08:56:25 +02:00
Sergio De la torre	3782170b9e	Merge pull request '5652-ItemTrash' (!1747) from 5652-ItemTrash into dev ... Reviewed-on: #1747 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-18 05:44:30 +00:00
Guillermo Bonet	690df509d3	refs #5684 Fixed no error	2023-09-18 07:10:12 +02:00
Sergio De la torre	881a1ee0b8	refs #5652 modify: solved Tests	2023-09-15 11:24:17 +02:00
Carlos Satorres	0912bd40f3	refs #5660 sql fix	2023-09-15 09:15:48 +02:00
Sergio De la torre	0403c67bad	Merge branch 'dev' into 5652-ItemTrash	2023-09-15 05:47:00 +00:00
Carlos Satorres	2a1e828e14	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant	2023-09-15 07:30:46 +02:00
Sergio De la torre	b756d2f938	refs #5652 modify	2023-09-14 18:03:30 +02:00
Sergio De la torre	0b39265d14	Merge pull request 'refs #6141feat:buyer model' (!1748) from 6141-model-Buyer into dev ... Reviewed-on: #1748 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-14 15:35:06 +00:00
Sergio De la torre	3cf4168e76	Merge branch 'dev' into 6141-model-Buyer	2023-09-14 11:50:07 +00:00
Javi Gallego	ca2257d29b	subo version 2340	2023-09-14 13:47:04 +02:00
Javi Gallego	0d78e5506b	Merge pull request 'dev' (!1750) from dev into test ... Reviewed-on: #1750	2023-09-14 11:40:17 +00:00
Javi Gallego	45d78307b9	Merge pull request 'move sql' (!1749) from fixSQL into dev ... Reviewed-on: #1749 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-14 11:33:36 +00:00
Carlos Satorres	11109d72a6	move sql	2023-09-14 11:36:09 +02:00
Javi Gallego	eff0975eb2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-09-14 10:27:03 +02:00
Javi Gallego	82631d6fcd	claimingRate divide por 100	2023-09-14 10:26:59 +02:00
Javi Gallego	e1b03172fb	Merge pull request 'test' (!1744) from test into dev ... Reviewed-on: #1744 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-14 07:32:24 +00:00
Sergio De la torre	43f5bbb04e	Merge branch 'dev' into 5652-ItemTrash	2023-09-14 09:05:55 +02:00
Sergio De la torre	4c1ff2e4d7	refs #6141feat:buyer model	2023-09-14 08:27:49 +02:00
Sergio De la torre	d2cd522842	refs #5652 modify:without fit	2023-09-14 07:47:10 +02:00
Carlos Satorres	a9b2aef27a	refs #5660 join and value	2023-09-13 12:02:25 +02:00
Carlos Satorres	5536e06ed1	Merge pull request '4764-serviceAbono' (!1505) from 4764-serviceAbono into dev ... Reviewed-on: #1505 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-13 09:47:34 +00:00
Carlos Satorres	12dff3e248	Merge branch 'dev' into 4764-serviceAbono	2023-09-13 08:52:59 +00:00
Javi Gallego	7bd3bfddc3	fix sin bankEntity ya no falla	2023-09-13 07:07:22 +02:00
Pablo Natek	e1cc254f82	Merge pull request 'refs #6131 constraint' (!1708) from 6131-duplicatedProvince into dev ... Reviewed-on: #1708 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-12 14:53:50 +00:00
Pablo Natek	d9088885e7	Merge branch 'dev' into 6131-duplicatedProvince	2023-09-12 14:47:38 +00:00
Javi Gallego	e25e0aad63	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-09-12 15:44:12 +02:00
Javi Gallego	f8149a988c	e2e invoiceIn basicData fixed	2023-09-12 15:44:05 +02:00
Carlos Satorres	0ddcb57209	refs #5660 fix e2e	2023-09-12 10:40:10 +02:00
Sergio De la torre	1d25355423	refs #5652 fix:without fit	2023-09-12 08:44:42 +02:00
Pablo Natek	37c57af2ed	Merge branch 'dev' into 6131-duplicatedProvince	2023-09-11 17:27:10 +00:00
Pablo Natek	1b158bea67	refs #6131 unique constraint country-name	2023-09-11 19:28:05 +02:00
Javi Gallego	705505b931	fixes #4059 acl for address	2023-09-11 16:24:47 +02:00
Sergio De la torre	5f5a0645be	refs #5652 feat:itemTrash_new	2023-09-11 16:16:49 +02:00
Carlos Satorres	49e635ff4b	refs #5660 dump dumpedFixtures	2023-09-11 13:49:18 +02:00
Carlos Satorres	d3e5e187e1	refs #5660 change acl	2023-09-11 13:46:52 +02:00