20319 Commits

All Branches

Search

Author	SHA1	Message	Date
Javi Gallego	075259dee9	Merge pull request 'fix: solo un trabajador por fallo' (!2210) from 6782-productionError_add into dev ... Reviewed-on: #2210 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-03-27 06:24:25 +00:00
Javi Gallego	c3aa4c9355	Merge branch 'dev' into 6782-productionError_add	2024-03-27 06:22:48 +00:00
Javier Segarra	d5a2c2f814	Merge pull request 'refs #5858 fix rename file' (!2214) from #5858_fix_extension into dev ... Reviewed-on: #2214 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-27 06:01:33 +00:00
Javier Segarra	e22122e577	Merge branch 'dev' into #5858_fix_extension	2024-03-27 05:52:52 +00:00
Javier Segarra	fe042e4d86	refs #5858 fix: test	2024-03-27 06:50:22 +01:00
Juan Ferrer	2604fb28f8	Merge pull request 'test' (!2217) from test into dev ... Reviewed-on: #2217	2024-03-26 16:04:28 +00:00
Juan Ferrer	ce86c04185	Merge pull request 'fix: HOTFIX PROC vn.collection_new release lock on error' (!2216) from master into test ... Reviewed-on: #2216	2024-03-26 16:04:12 +00:00
Juan Ferrer	9aa46c3a90	fix: HOTFIX PROC vn.collection_new release lock on error	2024-03-26 16:50:15 +01:00
Javier Segarra	281ac0c5c0	Merge branch 'dev' into #5858_fix_extension	2024-03-26 14:33:52 +00:00
Javier Segarra	8b20a56407	Merge pull request '#6930 FIX Show report and File.getPath' (!2215) from 6930_FIX_dms_TokenMultimedia into dev ... Reviewed-on: #2215 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-26 14:18:20 +00:00
Javier Segarra	38c5209c33	refs #6930 fix more endpoints	2024-03-26 15:01:28 +01:00
Javi Gallego	1472fc6fc2	feat: #6782 sin as	2024-03-26 14:02:47 +01:00
Javier Segarra	a2a16d227c	refs #5858 fix rename file	2024-03-26 12:41:30 +00:00
Javi Gallego	b978833a64	fix: #6782 with con esquema	2024-03-26 09:46:53 +01:00
Javi Gallego	e47b8c1056	fix: solo un trabajador por fallo	2024-03-26 08:52:01 +01:00
Alex Moreno	2212899400	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-26 08:35:38 +01:00
Alex Moreno	9ad2ff0cb7	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-03-26 08:35:06 +01:00
Alex Moreno	eb245772f2	Merge pull request 'refs #7118 deploy: dump' (!2208) from 7118-master_dump_2 into master ... Reviewed-on: #2208 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-03-26 07:33:33 +00:00
Alex Moreno	6d2ab2f4f3	refs #7118 deploy: dump	2024-03-26 08:24:24 +01:00
Alex Moreno	dce0155c00	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-26 08:18:47 +01:00
Jon Elias	c830c48ca9	Merge pull request 'style: #6556 set default user image, set users image' (!2168) from 6556-ChangeImages into dev ... Reviewed-on: #2168 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-26 06:35:10 +00:00
Sergio De la torre	5411433e52	Merge pull request '6276-newWarehouse-salix' (!2204) from 6276-newWarehouse-salix into master ... Reviewed-on: #2204 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-25 16:46:27 +00:00
Jon Elias	62d000c82c	refactor: refs 6556 deleted useless photos	2024-03-25 14:33:41 +01:00
Sergio De la torre	2a1204a00a	refs #6276 hotFix: setUserError and return	2024-03-25 13:27:52 +01:00
Sergio De la torre	0f5c5efcaa	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6276-newWarehouse-salix	2024-03-25 13:04:02 +01:00
Sergio De la torre	386bc1c934	refs #6276 hotFix: setUserError and return	2024-03-25 13:00:55 +01:00
Guillermo Bonet	bde8742147	fix: refs #7024 entry_checkBooked	2024-03-25 12:51:47 +01:00
Guillermo Bonet	092eaab851	Merge pull request 'feat: refs #7024 Added entry_checkBooked' (!2201) from 7024-entry_checkBooked into dev ... Reviewed-on: #2201 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-03-25 11:11:51 +00:00
Guillermo Bonet	9dcc885484	Merge pull request 'refactor: refs #6880 vn.professionalCategory changes' (!2203) from 6880-professionalCategory into dev ... Reviewed-on: #2203 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-03-25 10:26:48 +00:00
Jon Elias	3d2c4f8be3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6556-ChangeImages	2024-03-25 09:54:14 +01:00
Jorge Penadés	2e1e3f5abd	Merge pull request '#6085 add acl authenticated' (!2188) from 6085-hotFix-addOwnedAlias into master ... Reviewed-on: #2188 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-03-25 08:49:44 +00:00
Guillermo Bonet	df115ec58b	refactor: refs #6880 vn.professionalCategory changes	2024-03-25 09:41:05 +01:00
Guillermo Bonet	17e61b9caa	feat: refs #7024 Minor change	2024-03-25 08:50:18 +01:00
Sergio De la torre	c8e6a11549	Merge pull request 'master' (!2200) from master into test ... Reviewed-on: #2200 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-25 07:49:51 +00:00
Jorge Penadés	208f333b43	Merge pull request '#6951 create ticket_cloneAll' (!2120) from 6951-ticketCloneAll into dev ... Reviewed-on: #2120 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-25 07:48:19 +00:00
Jorge Penadés	308a449b94	Merge branch 'master' into 6085-hotFix-addOwnedAlias	2024-03-25 07:48:08 +00:00
Guillermo Bonet	4005fe9064	feat: refs #7024 Added entry_checkBooked	2024-03-25 08:47:06 +01:00
Jorge Penadés	256ae359ce	Merge branch 'dev' into 6951-ticketCloneAll	2024-03-25 07:46:38 +00:00
Sergio De la torre	25eb6735b0	Merge pull request 'refs #6276 feat:newWarehouse' (!2189) from 6276-newWarehouse-salix into master ... Reviewed-on: #2189 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-25 07:26:19 +00:00
Ivan Mas	c4d8ca7873	Merge pull request 'refs #6966 Modify name sale_replaceItem' (!2199) from 6966-Modify-name-sale_replaceItem into dev ... Reviewed-on: #2199 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-03-25 07:06:12 +00:00
Sergio De la torre	b179fc1b5a	Merge branch 'master' into 6276-newWarehouse-salix	2024-03-25 07:04:41 +00:00
Jorge Penadés	0867f4d501	fix: refs #6951 var names & procedure name	2024-03-22 16:01:22 +01:00
Jorge Penadés	e8d1967e11	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll	2024-03-22 15:14:12 +01:00
Ivan Mas	b9bcc5b2cf	refs #6966 changes required	2024-03-22 15:06:57 +01:00
Guillermo Bonet	5070d4d46f	hotfix item_getSimilar	2024-03-22 14:59:39 +01:00
Ivan Mas	3851d967f4	refs #6966 Modify name sale_replaceItem	2024-03-22 13:56:46 +01:00
Ivan Mas	d0f4f8a482	Merge pull request 'refs #6498 Delete multipleInventoryHistory' (!2198) from 6498_Delete_multipleInventoryHistory into dev ... Reviewed-on: #2198 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-03-22 12:04:10 +00:00
Ivan Mas	8a51df2fe5	refs #6498 Delete multipleInventoryHistory	2024-03-22 12:28:23 +01:00
Guillermo Bonet	bda80e03ee	Hotfix item_getSimilar	2024-03-22 11:36:26 +01:00
Pako Natek	6ad6c88c2c	Merge pull request 'floranet' (!2042) from 6021-floranet into dev ... Reviewed-on: #2042 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-03-22 10:20:03 +00:00