22489 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	3362d7562f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2024-06-26 12:33:19 +02:00
Alex Moreno	26ca72cc00	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-26 12:25:19 +02:00
Alex Moreno	cca62ae902	feat: return sql check error	2024-06-26 12:25:18 +02:00
Guillermo Bonet	ad4dd088a3	Merge branch 'test' into dev	2024-06-26 11:58:43 +02:00
Guillermo Bonet	220f402f4e	Merge pull request 'horfix: ticket 197676' (!2640) from ticket197676-hotfix into master ... Reviewed-on: #2640 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-26 09:53:25 +00:00
Carlos Satorres	90d23fc1a4	Merge pull request '7409-workerIncome' (!2597) from 7409-workerIncome into dev ... Reviewed-on: #2597 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-26 09:38:01 +00:00
Carlos Andrés	e75682e4d9	Merge pull request 'Hotfix-Ticket-197488-clonar-turnos' (!2638) from Hotfix-Ticket-197488-clonar-turnos into master ... Reviewed-on: #2638 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-26 09:33:18 +00:00
Robert Ferrús	ded7a5391f	Merge pull request 'fix: refs #7039 filterFix' (!2639) from 7039-hotFixFilterCountry into master ... Reviewed-on: #2639 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-06-26 08:24:59 +00:00
Carlos Satorres	f9a09f3fec	Merge branch 'dev' into 7409-workerIncome	2024-06-26 08:00:58 +00:00
Guillermo Bonet	c4af92e9ba	horfix: ticket 197676	2024-06-26 09:54:51 +02:00
Robert Ferrús	0534526ac2	fix: refs #7039 filterFix	2024-06-26 09:03:06 +02:00
Pako Natek	8aea57e8f9	Merge pull request 'version 240625' (!2637) from 6021-floranet240624 into dev ... Reviewed-on: #2637 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-06-26 05:40:18 +00:00
Pablo Natek	b23ff33e60	Merge branch 'dev' into 6021-floranet240624	2024-06-26 05:10:42 +00:00
Carlos Andrés	75486ae743	Hotfix ticketStateUpdate to ticket_setState	2024-06-25 19:47:22 +02:00
Carlos Andrés	5bcdc57978	Hotfix ticketStateUpdate to ticket_setState	2024-06-25 19:33:54 +02:00
Carlos Andrés	82118ae933	Hotfix ticketStateUpdate to ticket_setState	2024-06-25 19:30:59 +02:00
Sergio De la torre	b47637610b	Merge pull request 'feat: refs #7168 Added vRecords param in proc' (!2305) from 7168-itemShelvingLog_get into dev ... Reviewed-on: #2305 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-25 14:26:21 +00:00
Sergio De la torre	75f8de9277	Merge branch 'dev' into 7168-itemShelvingLog_get	2024-06-25 14:16:29 +00:00
Carlos Satorres	d1ed4b4459	refs #7409 fix back	2024-06-25 16:03:59 +02:00
Carlos Satorres	f21fe037f3	Merge branch '7409-workerIncome' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome	2024-06-25 14:49:35 +02:00
Carlos Satorres	ffff851d1a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome	2024-06-25 14:49:32 +02:00
Guillermo Bonet	b9278f3b3a	Merge branch 'test' into dev	2024-06-25 14:02:16 +02:00
Guillermo Bonet	2e1ab3af20	refs #7486 Fix same assign collection	2024-06-25 14:00:46 +02:00
Sergio De la torre	e55af8d36f	feat itemShelvingLog refs #7168	2024-06-25 13:41:10 +02:00
Sergio De la torre	acf308fd16	feat itemShelvingLog refs #7168	2024-06-25 13:35:21 +02:00
Sergio De la torre	c551e229fb	feat itemShelvingLog refs #7168	2024-06-25 13:30:46 +02:00
Carlos Andrés	ff1918ef06	Merge pull request 'feat: previas con sitema de reservas refs #6861' (!2176) from 6861-Pasar-modo-trabajo-de-previa-a-reservas into dev ... Reviewed-on: #2176 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-25 11:21:02 +00:00
Carlos Satorres	087a051a4a	Merge pull request 'refs #7406 worker formation' (!2511) from 7406-workerFormation into dev ... Reviewed-on: #2511 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-25 11:17:56 +00:00
Alex Moreno	dc628995b3	Merge branch 'dev' into 7409-workerIncome	2024-06-25 11:16:14 +00:00
Alex Moreno	dbab56a566	Merge branch 'dev' into 7406-workerFormation	2024-06-25 11:15:02 +00:00
Alex Moreno	85854e0713	warmFix: use vn	2024-06-25 13:14:44 +02:00
Pako Natek	4bf00bd428	version 240625	2024-06-25 12:51:14 +02:00
Carlos Satorres	f811e7e96c	Merge branch 'dev' into 7406-workerFormation	2024-06-25 10:39:38 +00:00
Carlos Satorres	f5bc0482d2	refs #7409 resolve conflicts	2024-06-25 12:36:28 +02:00
Carlos Satorres	95e1bba58b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome	2024-06-25 12:36:12 +02:00
Carlos Satorres	248358fbd7	refs #7409 fix pr	2024-06-25 12:35:25 +02:00
Carlos Satorres	655bbe4967	refs #7406 fix pr	2024-06-25 12:29:17 +02:00
Alex Moreno	45e8674087	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-25 11:34:35 +02:00
Alex Moreno	89dba7c3c0	Merge pull request 'build: db dump' (!2635) from 7631_dump into master ... Reviewed-on: #2635 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-06-25 09:32:00 +00:00
Carlos Satorres	cc8af9d14a	refs #6553 fix back	2024-06-25 10:21:24 +02:00
Alex Moreno	6150f64e88	build: db dump	2024-06-25 09:29:42 +02:00
Alex Moreno	cf0f80142f	hotFix: create view vn.expeditionTruck	2024-06-25 09:24:34 +02:00
Guillermo Bonet	134c38b9fd	refs #6753 Hotfix	2024-06-25 08:57:21 +02:00
Carlos Satorres	be0de3511b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2024-06-25 08:56:49 +02:00
Alex Moreno	ece055ca1e	Merge pull request '7631_testToMaster_2426' (!2634) from 7631_testToMaster_2426 into master ... Reviewed-on: #2634 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-06-25 06:36:57 +00:00
Alex Moreno	3f327866ca	Merge branch 'master' into 7631_testToMaster_2426	2024-06-25 06:35:33 +00:00
Robert Ferrús	dfd53f73e5	Merge pull request 'fix: refs #7611 & ticket195937 incoterms' (!2613) from 195937-icoterms into master ... Reviewed-on: #2613 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-25 05:58:30 +00:00
Robert Ferrús	f2caa4bec9	Merge branch 'master' into 195937-icoterms	2024-06-25 05:55:26 +00:00
Alex Moreno	0284f3b1ce	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-25 07:30:20 +02:00
Alex Moreno	f2ee1df8ac	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-06-25 07:29:56 +02:00