20427 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Robert Ferrús	dd977fab83	fix: refs #7141 catalog_calculate	2024-03-25 14:56:12 +01:00
Jon Elias	415b829db0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6514-gestDocSupplier	2024-03-25 14:40:02 +01:00
Jon Elias	62d000c82c	refactor: refs 6556 deleted useless photos	2024-03-25 14:33:41 +01:00
Jorge Penadés	7bf950306b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7002-fixUpdateTimeEntry	2024-03-25 13:59:55 +01:00
Jorge Penadés	eb2b0d41de	feat: refs #7002 update direction if device exists	2024-03-25 13:33:39 +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
Pako Natek	10a16fccd8	primer prototipo	2024-03-25 13:03:11 +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
Javi Gallego	8d258254d0	feat: #7013 change name procedure	2024-03-25 07:52:40 +01:00
Javi Gallego	3f3ba3c612	Merge branch 'dev' into 7013-solunionRiskRequest	2024-03-25 07:52:01 +01: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
Pablo Natek	531bd9ef80	Merge branch 'dev' into 6021-floranet	2024-03-22 10:17:49 +00:00
Pako Natek	214aff403a	delete fixtures local	2024-03-22 11:09:49 +01:00
Pako Natek	8fd7792e7c	gitignore	2024-03-22 11:05:48 +01:00
Jon Elias	595b86b33e	refs #6556 fixed hash changes	2024-03-22 10:10:40 +01:00
Carlos Satorres	641d7c0918	Merge pull request 'ref #5034 remove e2e' (!2193) from 5034-removeE2Econnection into dev ... Reviewed-on: #2193 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-22 08:38:42 +00:00
Jon Elias	c49b8bf954	refactor: refs #6556 minor changes	2024-03-22 09:35:09 +01:00
Carlos Satorres	1ad65d9925	Merge branch 'dev' into 5034-removeE2Econnection	2024-03-22 08:34:16 +00:00
Jon Elias	eadd8f750d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6556-ChangeImages	2024-03-22 08:22:49 +01:00
Guillermo Bonet	17f6327339	Merge pull request 'fix: refs #7018 Fix invoiceInTax_recalc' (!2192) from 7018-invoiceInTax_rec into dev ... Reviewed-on: #2192 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-22 06:38:50 +00:00
Guillermo Bonet	9e62db6d01	Merge pull request 'refactor: refs #6923 Deteted procs' (!2180) from 6923-migratedProcs into dev ... Reviewed-on: #2180 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-03-22 06:12:48 +00:00
Sergio De la torre	0116389290	Merge branch 'master' into 6276-newWarehouse-salix	2024-03-22 06:01:17 +00:00
Sergio De la torre	9e5e49c28f	refs #6276 feat:newWarehouse	2024-03-22 06:56:27 +01:00