20271 Commits

All Branches

Search

Author	SHA1	Message	Date
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	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	256ae359ce	Merge branch 'dev' into 6951-ticketCloneAll	2024-03-25 07:46:38 +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
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
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
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
Guillermo Bonet	84056e3c2a	Merge branch 'dev' into 7018-invoiceInTax_rec	2024-03-21 14:57:47 +01:00
Guillermo Bonet	122fe7eecd	Merge branch 'test' into dev	2024-03-21 14:46:09 +01:00
Guillermo Bonet	6dff42a45d	Merge pull request 'ticket #167473 Hotfix' (!2191) from ticket167473-hotfix into master ... Reviewed-on: #2191 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-21 12:45:28 +00:00
Guillermo Bonet	2b26153bfa	refactor: refs #7018 Requested changes	2024-03-21 12:52:04 +01:00
Carlos Satorres	ece94c2bd1	ref #5034 remove e2e	2024-03-21 12:39:39 +01:00
Guillermo Bonet	ee67820c20	refactor: refs #7018 Fix invoiceInTax_recalc	2024-03-21 12:14:48 +01:00
Guillermo Bonet	535dd40625	fix: refs #7018 Fix invoiceInTax_recalc	2024-03-21 12:06:59 +01:00
Ivan Mas	268c63ce8f	Merge pull request 'refs #6498 procRefactor6' (!2134) from 6499-procRefactor6 into dev ... Reviewed-on: #2134 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-03-21 11:03:32 +00:00
Ivan Mas	c33c90aefe	Merge branch 'dev' into 6499-procRefactor6	2024-03-21 10:39:05 +00:00
Guillermo Bonet	d0067c8096	ticket #167473 Hotfix	2024-03-21 11:30:10 +01:00
Pablo Natek	130fb68d27	Merge pull request 'feat: refs #6302 delete after add to turn' (!2187) from 6302-delete-ticket-after-add-to-turn into dev ... Reviewed-on: #2187 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-21 09:28:39 +00:00
Guillermo Bonet	1cd495df06	fix: refs #7018 Fix invoiceInTax_recalc	2024-03-21 09:25:33 +01:00
Guillermo Bonet	844291fec9	Merge branch 'dev' into 6923-migratedProcs	2024-03-21 07:20:23 +00:00
Guillermo Bonet	2f87ba03b2	Merge branch 'test' into dev	2024-03-21 08:16:44 +01:00
Guillermo Bonet	bbbd212547	build: refs #5846 HOTFIX Myt updated	2024-03-21 08:14:59 +01:00
Guillermo Bonet	de83cef68c	build: refs #5846 HOTFIX Myt updated	2024-03-21 08:01:27 +01:00
Alex Moreno	b087c35a36	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-21 08:01:05 +01:00
Alex Moreno	60ebe31b3f	Merge pull request '2412_testToMaster' (!2185) from 2412_testToMaster into master ... Reviewed-on: #2185 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-03-21 06:00:09 +00:00
Pablo Natek	da8fbb5a92	fix: refs #6302 spec	2024-03-20 21:14:01 +01:00
Pablo Natek	f7b458d368	feat: refs #6302 delete after add to turn	2024-03-20 20:54:24 +01:00
Alex Moreno	adddcc96aa	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-03-20 15:01:17 +01:00
Alex Moreno	d89e35c429	Merge pull request 'hotFix(closeAll): fix debug' (!2179) from hotFix_closeAll_debug into master ... Reviewed-on: #2179 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-20 13:55:45 +00:00
Carlos Satorres	120419c423	Merge pull request 'refs #6842 remove sage' (!2182) from 6842-fixViewEmpresa into dev ... Reviewed-on: #2182 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-20 13:26:00 +00:00
Carlos Satorres	5a45cf7ea2	refs #6842 remove sage	2024-03-20 13:39:26 +01:00
Guillermo Bonet	d53a053ccb	refactor: refs #6923 Deteted procs	2024-03-20 13:07:02 +01:00
Alex Moreno	7895a51e33	hotFix(closeAll): fix debug	2024-03-20 12:15:41 +01:00
Guillermo Bonet	a76b7c8535	Merge pull request 'feat: refs #6395 Added buyerFk in buy' (!2020) from 6395-buyBuyerFk into dev ... Reviewed-on: #2020 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-03-20 09:09:16 +00:00
Guillermo Bonet	cdaa7999d1	Merge branch 'dev' into 6395-buyBuyerFk	2024-03-20 07:55:05 +00:00
Guillermo Bonet	397b49db91	fix: refs #6232 Comment conveyorConfig lines	2024-03-20 08:02:11 +01:00