20500 Commits

All Branches

Search

Author	SHA1	Message	Date
Sergio De la torre	caf99a9738	refs #3520 feat:uncheckedTicket	2024-03-26 11:06:14 +01:00
Sergio De la torre	678eb2928f	refs #6964 feat:hasItemOlder	2024-03-26 10:30:17 +01:00
Sergio De la torre	c265896224	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder	2024-03-26 10:24:27 +01:00
Sergio De la torre	dc5f588c8e	refs #3520 feat: backWarehouse in Salix	2024-03-26 10:13:57 +01:00
Javi Gallego	04117d2c27	fix: #7013 quito vn.	2024-03-26 10:13:10 +01:00
Javi Gallego	b978833a64	fix: #6782 with con esquema	2024-03-26 09:46:53 +01:00
Javi Gallego	7f14211b80	feat: #7117 company_getSuppliersDebt devolver el pais del banco	2024-03-26 09:27:30 +01:00
Jon Elias	a5082d04f9	refs: #6514 fixed error	2024-03-26 08:52:11 +01:00
Javi Gallego	e47b8c1056	fix: solo un trabajador por fallo	2024-03-26 08:52:01 +01:00
Jon Elias	0f4e1acf09	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6514-gestDocSupplier	2024-03-26 08:37:51 +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
Jon Elias	04e42cd3c8	feat: #6514 created supplierDms functionality	2024-03-26 08:29:07 +01: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
Sergio De la torre	e8ad5b1d17	Merge branch '6964_itemOlder' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder	2024-03-25 16:08:25 +01:00
Sergio De la torre	1840117b3b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder	2024-03-25 16:08:11 +01:00
Sergio De la torre	e84805508a	Merge branch 'dev' into 6964_itemOlder	2024-03-25 15:07:54 +00:00
Sergio De la torre	8b684442f5	refs #6276 hotFix: setUserError and return	2024-03-25 16:07:20 +01: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
Sergio De la torre	1b09c5b4ba	Merge branch 'dev' into 6964_itemOlder	2024-03-25 07:24:57 +00:00
Sergio De la torre	a40234ba9b	refs #6964 feat:hasItemOlder	2024-03-25 08:20:08 +01: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
Sergio De la torre	22f78dbb91	refs #6964 feat:hasItemOlder	2024-03-25 07:54:51 +01:00
Sergio De la torre	8e1ba54616	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder	2024-03-25 07:54:07 +01:00