21078 Commits

All Branches

Search

Author	SHA1	Message	Date
Robert Ferrús	0a4cd4d4d0	feat: company_getSuppliersDebtHotFix	2024-04-17 09:58:27 +02:00
Javier Segarra	6214da2c42	feat(salix): refs #6930 Undo rollback salix-back	2024-04-17 09:52:53 +02:00
Guillermo Bonet	9f9662924d	Merge pull request 'feat: refs #6968 Changed groupingMode to enum' (!2306) from 6968-groupingModeRefactor into dev ... Reviewed-on: #2306 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-17 06:48:43 +00:00
Robert Ferrús	a0f3c6183b	Merge branch 'test' into 7219-sale_replaceItem	2024-04-17 06:42:18 +00:00
Guillermo Bonet	f1bb2fbcb3	Merge branch 'test' into dev	2024-04-17 08:41:33 +02:00
Guillermo Bonet	7d50907676	Merge branch 'master' into test	2024-04-17 08:41:10 +02:00
Guillermo Bonet	786a5a68b9	hotfix: EKT	2024-04-17 08:40:25 +02:00
Sergio De la torre	ae88a8a281	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery	2024-04-17 07:44:08 +02:00
Juanjo Breso	3950d60387	feat: refs#6493 Cambios solicitados procedimientos	2024-04-17 07:37:58 +02:00
Juanjo Breso	97c0db62ac	Merge branch '6493-refactorizar-procedimientos-vn2008-parte_2' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-17 07:33:11 +02:00
Juanjo Breso	187c918a21	feat: refs#6493 Cambios solicitados procedimientos	2024-04-17 07:33:08 +02:00
Juanjo Breso	81b2e89fd8	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-17 05:30:39 +00:00
Guillermo Bonet	bc2b6ff97e	feat: refs #7173 Added traduction	2024-04-17 07:25:46 +02:00
Guillermo Bonet	36bf770ed4	Merge pull request 'feat: refs #7173 Bloquear facturas recibidas contabilizadas' (!2258) from 7173-Restricción-eliminar/modificar-vn.invoiceIn into dev ... Reviewed-on: #2258 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-17 05:17:36 +00:00
Guillermo Bonet	d92d373db4	Merge branch 'dev' into 6968-groupingModeRefactor	2024-04-17 05:15:37 +00:00
Guillermo Bonet	c8e7706652	feat: refs #6968 Requested changes	2024-04-17 07:15:24 +02:00
Pablo Natek	886bd7f105	Merge pull request 'fix: refs #6021 catalogue_findById' (!2312) from 6021-fix-item_get into dev ... Reviewed-on: #2312 Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-04-16 16:00:55 +00:00
Pablo Natek	31b23f4667	Merge branch '6021-fix-item_get' of https://gitea.verdnatura.es/verdnatura/salix into 6021-fix-item_get	2024-04-16 18:00:16 +02:00
Pablo Natek	e15fb8dec6	fix: refs #6021 proc	2024-04-16 18:00:15 +02:00
Pablo Natek	70c9bae710	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6021-fix-item_get	2024-04-16 17:58:04 +02:00
Pako Natek	2b39d3fa15	Merge branch 'dev' into 6021-fix-item_get	2024-04-16 15:56:15 +00:00
Pablo Natek	dac562e960	Merge pull request 'feat: refs #6021 order_put refactor' (!2311) from 6021-fix-orderPut into dev ... Reviewed-on: #2311 Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-04-16 15:54:19 +00:00
Pablo Natek	1d29c77aa7	feat: refs #6021 fix proc	2024-04-16 17:53:21 +02:00
Pablo Natek	70836b93b6	fix: refs #6021 catalogue_findById	2024-04-16 17:51:34 +02:00
Pako Natek	145aeb5834	Merge pull request 'item_get' (!2309) from 6021-floranet_item_get into dev ... Reviewed-on: #2309 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-04-16 15:46:59 +00:00
Pako Natek	12f7cc85ed	Merge branch 'dev' into 6021-floranet_item_get	2024-04-16 15:45:41 +00:00
Pako Natek	c1c6204eab	Merge branch 'dev' into 6021-fix-orderPut	2024-04-16 15:44:02 +00:00
Pablo Natek	f05b33787f	feat: refs #6021 order_put refactor	2024-04-16 17:42:36 +02:00
Guillermo Bonet	e4c3704231	Merge branch 'test' into dev	2024-04-16 17:25:49 +02:00
Guillermo Bonet	62596de1dd	Merge branch 'master' into test	2024-04-16 17:25:28 +02:00
Guillermo Bonet	db5b0d7967	hotfix: ticket#174761 Greatest fix null possibility	2024-04-16 17:19:25 +02:00
Pako Natek	f5fd708891	item_get	2024-04-16 17:08:45 +02:00
Javier Segarra	b8b70a3de0	Merge pull request '#7190 - Renew tokenMultimedia' (!2272) from 7190_renewTokenMultimedia into dev ... Reviewed-on: #2272 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-16 12:25:53 +00:00
Javier Segarra	b39033171e	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-04-16 12:16:17 +00:00
Ivan Mas	aed875743a	Merge pull request '7161DeleteitemTrash' (!2273) from 7161DeleteitemTrash into dev ... Reviewed-on: #2273 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-16 11:39:56 +00:00
Ivan Mas	3a7b0df36f	Merge branch 'dev' into 7161DeleteitemTrash	2024-04-16 11:29:03 +00:00
Robert Ferrús	01d959f6f4	feat: refs #7219	2024-04-16 12:46:50 +02:00
Guillermo Bonet	56dc0ddb68	Merge branch 'test' into dev	2024-04-16 12:32:53 +02:00
Guillermo Bonet	9ea1ac2a56	Merge branch 'master' into test	2024-04-16 12:32:27 +02:00
Guillermo Bonet	7fda58d4a4	hotfix: ticket#174308 Ekt load packing	2024-04-16 12:29:44 +02:00
Guillermo Bonet	7a557be09a	feat: refs #6968 Changed groupingMode to enum	2024-04-16 11:07:57 +02:00
Robert Ferrús	ffd7b3cf50	Merge branch 'dev' into 6500-procRefactor8	2024-04-16 08:39:08 +00:00
Guillermo Bonet	4678c0567b	Merge branch '7173-Restricción-eliminar/modificar-vn.invoiceIn' of https://gitea.verdnatura.es/verdnatura/salix into 7173-Restricción-eliminar/modificar-vn.invoiceIn	2024-04-16 08:58:27 +02:00
Guillermo Bonet	45fac06c6b	feat: refs #7173 Added restrictions in invoiceIn structure	2024-04-16 08:58:26 +02:00
Guillermo Bonet	d88957d157	Merge branch 'dev' into 7173-Restricción-eliminar/modificar-vn.invoiceIn	2024-04-16 06:45:04 +00:00
Guillermo Bonet	91d5f51e73	Merge branch '7173-Restricción-eliminar/modificar-vn.invoiceIn' of https://gitea.verdnatura.es/verdnatura/salix into 7173-Restricción-eliminar/modificar-vn.invoiceIn	2024-04-16 08:44:51 +02:00
Guillermo Bonet	93abfdd8a1	feat: refs #7173 Added restrictions in invoiceIn structure	2024-04-16 08:44:50 +02:00
Jorge Penadés	22006ea3fb	Merge pull request '#6938 add scope & acls' (!2301) from 6938-hideWorkerPhone into dev ... Reviewed-on: #2301 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-16 06:38:46 +00:00
Sergio De la torre	d24de61213	refs #6921 feat: addFromDelivery	2024-04-16 08:29:39 +02:00
Javier Segarra	f0b0f3cee7	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-04-16 06:24:34 +00:00