4578 Commits

Author	SHA1	Message	Date
Juanjo Breso	4389cd5d74	feat: refs#6493 modificar procedimiento available_traslate	2024-04-02 09:56:46 +02:00
Pako Natek	cb745b0f4d	release_lock	2024-04-01 14:21:34 +02:00
Pako Natek	bfa59bdcea	release_lock	2024-04-01 14:20:25 +02:00
Pako Natek	3a1f5109d9	lines and volume	2024-04-01 11:58:16 +02:00
Pako Natek	7c4fc31b50	version productionConfig	2024-04-01 08:55:21 +02:00
Pako Natek	df911b9b75	fora comentaris	2024-04-01 08:47:47 +02:00
Pako Natek	547df47049	delete old proc	2024-04-01 08:47:16 +02:00
Pako Natek	98b1e933f7	prova	2024-04-01 08:46:07 +02:00
Pako Natek	9aae9677e6	modificaciones	2024-04-01 08:43:26 +02:00
Jorge Penadés	df271a242d	fix: refs #6492 procedure	2024-03-28 15:03:33 +01:00
Pako Natek	c942786783	pruebas	2024-03-28 14:54:30 +01:00
Juanjo Breso	a911d7fc88	Merge branch '6493-refactorizar-procedimientos-vn2008-parte2' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte2	2024-03-28 14:27:38 +01:00
Juanjo Breso	46f60615bd	feat: refs#6493 modificar procedimiento available_traslate	2024-03-28 14:27:29 +01:00
Jorge Penadés	e851c3b481	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008	2024-03-28 14:15:31 +01:00
Jorge Penadés	e83d8b1464	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6724-permisos-vn.entry.isBooked	2024-03-28 13:35:33 +01:00
Robert Ferrús	9a7bcdf104	fix: company_getSuppliersDebt	2024-03-28 13:26:09 +01:00
Pako Natek	d031fef1a0	Merge branch 'dev' into 6358-boxPicking_blueMammut	2024-03-28 11:47:40 +00:00
Pako Natek	1d906c993b	portes	2024-03-28 12:43:13 +01:00
Pako Natek	b445d745a5	cambios	2024-03-28 11:40:18 +01:00
Sergio De la torre	b62905c5ef	Merge branch 'dev' into 6964_itemOlder	2024-03-28 10:08:56 +00:00
Robert Ferrús	1c18b09531	fix: company_getSuppliersDebt	2024-03-28 10:47:47 +01:00
Robert Ferrús	063745167e	fix: modificar company_getSuppliersDebt	2024-03-28 10:30:41 +01:00
Carlos Satorres	9f438751d3	Merge branch 'dev' into 6074-KkearisBlocked	2024-03-28 08:13:37 +00:00
Javi Gallego	585dd70a60	Merge pull request 'feat: #7117 company_getSuppliersDebt devolver el pais del banco' (!2211) from 7117 into dev ... Reviewed-on: #2211	2024-03-28 08:02:30 +00:00
Javi Gallego	699883182c	Merge pull request '7120-specialPrice' (!2213) from 7120-specialPrice into dev ... Reviewed-on: #2213 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-03-28 08:01:45 +00:00
Javi Gallego	6596efdc91	Merge pull request '7013-solunionRiskRequest' (!2190) from 7013-solunionRiskRequest into dev ... Reviewed-on: #2190 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-03-28 08:01:28 +00:00
Pako Natek	8396b8cd64	Merge branch 'dev' into 6358-boxPicking_YellowZebra	2024-03-28 07:19:12 +00:00
Alex Moreno	f1931fce69	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-28 08:19:26 +01:00
Alex Moreno	0b764ebc1b	Merge pull request '#6514 - gestDocSupplier' (!2209) from 6514-gestDocSupplier into dev ... Reviewed-on: #2209 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-28 07:12:51 +00:00
Robert Ferrús	1f819ab16a	fix: riesgos	2024-03-27 19:02:05 +01:00
Carlos Andrés	30e1acedf3	Merge pull request 'fix: TRIGGER incorrecto en travel refs #7148' (!2223) from 7148-TRIGGER-en-travel-incorrectos into master ... Reviewed-on: #2223 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-27 17:59:51 +00:00
Carlos Satorres	f4915fbe2e	Merge branch 'dev' into 6074-KkearisBlocked	2024-03-27 16:50:03 +00:00
Robert Ferrús	ed1bc06301	feat: refs #7150	2024-03-27 17:30:52 +01:00
Robert Ferrús	9667d31441	feat: refs #7150	2024-03-27 17:00:27 +01:00
Juan Ferrer	f917a9895b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2024-03-27 16:18:22 +01:00
Juan Ferrer	2a8256319f	fix: #6085 Old db/changes directory removed	2024-03-27 16:18:21 +01:00
Carlos Satorres	97b2500eea	refs #6074 fix comment	2024-03-27 14:24:58 +01:00
Carlos Andrés	4ac418111b	fix: TRIGGER incorrecto en travel refs #7148	2024-03-27 14:12:34 +01:00
Pako Natek	09c9a3d7ef	vRest	2024-03-27 12:25:57 +01:00
Pako Natek	8f872b4bbb	Merge branch '6358-boxPicking_YellowZebra' of https://gitea.verdnatura.es/verdnatura/salix into 6358-boxPicking_YellowZebra	2024-03-27 12:22:26 +01:00
Pako Natek	c9431e605e	second proposals	2024-03-27 12:22:22 +01:00
Robert Ferrús	c3e3d72182	Merge branch 'master' into 7141-sale_replaceItem	2024-03-27 10:53:31 +00:00
Alex Moreno	b532ce3f77	hotFix: recreate addressTaxArea	2024-03-27 08:30:45 +01:00
Javi Gallego	fe0a1ad7be	feat: #7013 purge productionError	2024-03-27 08:12:05 +01:00
Javi Gallego	4b41ac68aa	feat: #7013 en mayusculas y con espacio en comentarios	2024-03-27 08:05:33 +01:00
Pako Natek	b1a91ab7d3	Merge branch 'dev' into 6358-boxPicking_YellowZebra	2024-03-27 06:55:41 +00:00
Alex Moreno	5a19c1ebb1	Merge branch 'dev' into 6964_itemOlder	2024-03-27 06:30:00 +00:00
Javi Gallego	c3aa4c9355	Merge branch 'dev' into 6782-productionError_add	2024-03-27 06:22:48 +00:00
Javi Gallego	2881409b1e	feat: #7120 con fecha por defecto	2024-03-27 07:19:51 +01:00
Sergio De la torre	43b042a616	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder	2024-03-27 07:08:47 +01: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	9aa46c3a90	fix: HOTFIX PROC vn.collection_new release lock on error	2024-03-26 16:50:15 +01:00
Robert Ferrús	8e2770aa56	feat: refs #7141	2024-03-26 16:27:49 +01:00
Pako Natek	861d9b3135	javi's proposals	2024-03-26 14:59:06 +01:00
Pako Natek	5d813784b4	Merge branch 'dev' into 6358-boxPicking_YellowZebra	2024-03-26 14:17:34 +01:00
Javi Gallego	1472fc6fc2	feat: #6782 sin as	2024-03-26 14:02:47 +01:00
Jorge Penadés	94f6d20bb1	feat: refs #6942 add Insert	2024-03-26 13:41:53 +01:00
Javier Segarra	a2a16d227c	refs #5858 fix rename file	2024-03-26 12:41:30 +00:00
Jorge Penadés	634bfc5091	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008	2024-03-26 12:30:07 +01:00
Javi Gallego	9408b82874	feat: #7120 con esquema	2024-03-26 12:18:53 +01:00
Javi Gallego	57c42b6808	feat: #7117 añado NOT	2024-03-26 12:16:03 +01:00
Javi Gallego	587dd8f4d9	feat: #7013 sin tabular	2024-03-26 12:12:27 +01:00
Javi Gallego	c99de95b33	feat: #7120 con tabla temporal	2024-03-26 12:07:23 +01:00
Robert Ferrús	3e2e0ccadb	Merge branch 'master' into 7141-sale_replaceItem	2024-03-26 11:00:44 +00: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
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
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
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
Juanjo Breso	9a628869cd	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte2	2024-03-26 06:45:27 +00: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	1840117b3b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder	2024-03-25 16:08:11 +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
Pako Natek	10a16fccd8	primer prototipo	2024-03-25 13:03:11 +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
Jon Elias	3d2c4f8be3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6556-ChangeImages	2024-03-25 09:54:14 +01:00
Juanjo Breso	f4b50dec3e	feat: refs#6493 modificar procedimiento balance_create	2024-03-25 09:41:16 +01: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
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	1b09c5b4ba	Merge branch 'dev' into 6964_itemOlder	2024-03-25 07:24:57 +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	8e1ba54616	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder	2024-03-25 07:54:07 +01: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	8a51df2fe5	refs #6498 Delete multipleInventoryHistory	2024-03-22 12:28:23 +01:00
Sergio De la torre	61b649fdc5	refs #6964 feat:advice for olderItem	2024-03-22 11:47:12 +01:00
Guillermo Bonet	bda80e03ee	Hotfix item_getSimilar	2024-03-22 11:36:26 +01: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
Jon Elias	c49b8bf954	refactor: refs #6556 minor changes	2024-03-22 09:35:09 +01:00
Juanjo Breso	f2a1d401ca	refs#6493 update	2024-03-22 08:32:38 +01: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
Juanjo Breso	84f544dd2b	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte2	2024-03-22 06:49:21 +00: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
Carlos Satorres	ca0d269ee2	refs #6074 remove isBlocked	2024-03-21 15:02:09 +01: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
Robert Ferrús	9795f449b9	Merge branch 'dev' into 6738-cleanTables2008Part2to2	2024-03-21 12:23:06 +00:00
Guillermo Bonet	2b26153bfa	refactor: refs #7018 Requested changes	2024-03-21 12:52:04 +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	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
Javi Gallego	a24d38128b	feat: #7013 muestra solo clientes asegurados	2024-03-21 10:48:43 +01:00
Javi Gallego	c46e7227e7	feat: #7013 solo muestra clientes asegurados	2024-03-21 10:40:30 +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
Javi Gallego	20a338f746	feat: #7120 specialPrice with new fiels	2024-03-21 10:25:08 +01:00
Ivan Mas	db71e69317	Merge branch 'dev' into 6827-check-usernames-special-characters	2024-03-21 09:21:32 +00:00
Sergio De la torre	9eee26cbe9	refs #6276 feat:newWarehouse	2024-03-21 10:18:54 +01: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
Alex Moreno	b087c35a36	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-21 08:01:05 +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
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
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
Guillermo Bonet	b327120932	fix: refs #6232 Comment queueConfig lines	2024-03-20 07:39:38 +01:00
Guillermo Bonet	8a96327d97	Merge branch 'dev' into 6232-refactorConfigTables	2024-03-20 06:17:06 +00:00
Carlos Andrés	1315a854a9	fix: closeTicket idem salix Refs: #6549	2024-03-18 18:15:05 +01:00
Carlos Andrés	913b261f86	Merge branch 'dev' into 6549-ticket_close	2024-03-18 17:55:54 +01:00
Pako Natek	8f54a7f12d	deliveryDate	2024-03-18 14:03:16 +01:00
Alex Moreno	4f90fb06d8	hotFix(debug) varchar to text	2024-03-18 13:25:23 +01:00
Jon Elias	8e237f84c1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6556-ChangeImages	2024-03-18 11:55:55 +01:00
Jorge Penadés	07326e502b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll	2024-03-18 08:23:47 +01:00
Jorge Penadés	f044809f30	feat: refs #6951 to create back	2024-03-15 15:45:47 +01:00
Guillermo Bonet	3aa81d27e7	refs #6875 Packing default 1	2024-03-15 14:53:31 +01:00
Jorge Penadés	0fd6a6360c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll	2024-03-15 14:18:02 +01:00
Jon Elias	6d4f07adc3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6556-ChangeImages	2024-03-15 14:13:24 +01:00
Javier Segarra	0f4377ff5d	refs #5858 test: fixtures	2024-03-15 13:31:51 +01:00
Javier Segarra	bfdbbc0fdf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-15 12:22:57 +01:00
Guillermo Bonet	336d5f0fba	Merge branch 'dev' into 6232-refactorConfigTables	2024-03-15 10:48:42 +00:00
Guillermo Bonet	158ed9b55c	refs #6232 Regularized config tables	2024-03-15 11:49:33 +01:00
Jorge Penadés	c1018d465a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll	2024-03-15 11:01:59 +01:00
Guillermo Bonet	ea054eafd5	Merge branch 'test' into dev	2024-03-15 10:56:11 +01:00
Guillermo Bonet	aa27eb1922	refs #6948 Fix error	2024-03-15 10:55:39 +01:00
Jorge Penadés	a38f93b0e3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll	2024-03-15 10:44:37 +01:00
Jorge Penadés	690d935429	refactor: refs #6951 cloneAll	2024-03-15 10:00:24 +01:00
Carlos Satorres	1c523d8d22	Merge branch 'dev' into 6842-sageMod	2024-03-15 08:43:41 +00:00
Javier Segarra	6989299593	Merge branch 'dev' into 6930_scopedToken_Multimedia	2024-03-15 08:26:45 +00:00
Carlos Andrés	160d72e755	hotfix upload invoiceIn_add.sql error	2024-03-14 17:02:07 +01:00
Jorge Penadés	4c6def5a52	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6724-permisos-vn.entry.isBooked	2024-03-14 16:26:24 +01:00
Jon Elias	82001d8352	Merge branch 'dev' into 6556-ChangeImages	2024-03-14 14:11:06 +00:00
Jon Elias	d8a5bf8c84	style: #6556 set default user image, set users image	2024-03-14 15:04:35 +01:00
Jorge Penadés	d7115e40c1	feat: refs #6492 dropping vn2008 procedures	2024-03-14 12:10:08 +01:00
Jorge Penadés	46b7acb52a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008	2024-03-14 11:54:35 +01:00
Jorge Penadés	ff130b773d	fix: refs #6492 drop useless insert	2024-03-14 11:49:21 +01:00
Robert Ferrús	0f57931b3a	Merge branch 'dev' into 6738-cleanTables2008Part2to2	2024-03-14 10:43:14 +00:00
Carlos Andrés	3999533707	Merge branch 'test' into 6960-restricciones-AWB	2024-03-14 11:33:14 +01:00
Carlos Andrés	1e29b6c1ed	merge test	2024-03-14 11:30:07 +01:00
Pablo Natek	e3b7c7bb60	Merge branch 'dev' into 6005-backupLabeler	2024-03-14 09:39:13 +00:00
Guillermo Bonet	184a3a3c7a	refs #6395 Requested changes	2024-03-14 10:05:25 +01:00
Guillermo Bonet	166b74c70d	Merge branch 'dev' into 6395-buyBuyerFk	2024-03-14 08:59:22 +00:00
Carlos Satorres	1457884252	Merge branch 'dev' into 6755-restoreRefactor	2024-03-14 08:54:06 +00:00
Carlos Satorres	dd7c700130	refs #6755 fix test	2024-03-14 09:53:50 +01:00
Jorge Penadés	3e458281e6	fix: refs #6492 boxes alias	2024-03-14 09:42:54 +01:00
Guillermo Bonet	fbeb9b058d	hotfix: itemProposal added optimizer_search_depth	2024-03-14 09:34:37 +01:00
Guillermo Bonet	ad7b7be661	refs #6875 Fix version	2024-03-14 09:15:19 +01:00
Jorge Penadés	7a94ae3551	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008	2024-03-14 09:10:44 +01:00
Guillermo Bonet	08359cdfe0	Merge pull request 'refactor: refs #6875 Add restriction on vn.buy.packing field not null and > 0' (!2047) from 6875-packingNotNull into dev ... Reviewed-on: #2047 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-14 08:05:11 +00:00
Alex Moreno	0ad052c34a	refs #7033 deploy(2412): dev to test	2024-03-14 08:36:19 +01:00
Carlos Satorres	7895f12e3d	Merge branch 'dev' into 6842-sageMod	2024-03-14 07:28:12 +00:00
Carlos Satorres	2d8f5f5f50	Merge branch '6842-sageMod' of https://gitea.verdnatura.es/verdnatura/salix into 6842-sageMod	2024-03-14 08:26:52 +01:00
Carlos Satorres	e24eed16c1	refs #6842 fix companyCode	2024-03-14 08:26:50 +01:00
Guillermo Bonet	b4b6b47a9c	hotfix: itemProposal added transaction	2024-03-14 07:53:24 +01:00
Robert Ferrús	2d7110f05c	Merge branch 'dev' into 6738-cleanTables2008Part2to2	2024-03-14 06:08:00 +00:00
Guillermo Bonet	4b83d416b2	Merge pull request 'refactor: refs #7018 Mirated procs to vn' (!2157) from 7018-procMigration into dev ... Reviewed-on: #2157 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-03-14 06:03:32 +00:00
Robert Ferrús	1d434da539	Merge branch 'dev' into 6500-procRefactor8	2024-03-14 05:59:22 +00:00
Carlos Andrés	77d1a38a87	fix: closeTicket idem salix refs #6549	2024-03-13 18:51:11 +01:00
Javier Segarra	4012b1756d	refs #5858 add comment	2024-03-13 15:00:12 +01:00
Carlos Satorres	1315bfda88	refs #6755 fix test	2024-03-13 14:18:53 +01:00
Robert Ferrús	6163cad8a5	refs #6738	2024-03-13 14:17:10 +01:00
Pako Natek	67b55ae845	fixtures local	2024-03-13 14:16:27 +01:00
Robert Ferrús	fad30eb56d	feat: refs #6738	2024-03-13 14:08:14 +01:00
Pako Natek	25f979156a	nuevo url para catalogue y sliders_get	2024-03-13 14:00:59 +01:00
Guillermo Bonet	11dcb6e79f	refactor: refs #6875 packing not null, negative or zero	2024-03-13 13:45:57 +01:00
Carlos Satorres	41fbae7eec	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6755-restoreRefactor	2024-03-13 13:37:38 +01:00
Robert Ferrús	052acdcc08	feat: refs #7029 packaging	2024-03-13 13:20:14 +01:00
Robert Ferrús	2d9a106fab	feat: refs #6738 premisos	2024-03-13 12:59:45 +01:00
Robert Ferrús	0413707061	feat: refs #6738	2024-03-13 12:50:27 +01:00
Sergio De la torre	b4fe00a028	Merge branch 'dev' into 6078_workerActivty	2024-03-13 11:36:59 +00:00
Carlos Andrés	ff459ea3be	fix: closeTicket idem salix refs #6549	2024-03-13 12:18:43 +01:00
Javier Segarra	172e7566b5	refs #5858 perf: improve insert	2024-03-13 11:58:25 +01:00
Guillermo Bonet	cbaa48a933	Merge branch 'dev' into 6875-packingNotNull	2024-03-13 10:56:17 +00:00
Javier Segarra	8276765225	refs #5858 perf: destinationFk to pepe	2024-03-13 11:54:02 +01:00
Carlos Satorres	f79d1320d8	Merge branch 'dev' into 6842-sageMod	2024-03-13 10:29:07 +00:00
Guillermo Bonet	14571ed10f	Merge branch 'dev' into 7018-procMigration	2024-03-13 09:39:55 +00:00
Robert Ferrús	786eb08779	Merge branch 'dev' into 6738-cleanTables2008Part2to2	2024-03-13 07:07:42 +00:00
Alex Moreno	bce82881f3	Merge branch 'dev' into 6005-backupLabeler	2024-03-13 07:03:56 +00:00
Guillermo Bonet	b5f3753253	Merge branch 'test' into dev	2024-03-13 07:42:51 +01:00
Guillermo Bonet	319bf314b3	hotfix: itemProposal	2024-03-13 07:38:14 +01:00
Robert Ferrús	a6de9fd370	feat: refs #6738 modificar a nombres propuestos	2024-03-13 07:19:06 +01:00
Jorge Penadés	9e596e6525	fix: refs #6492 file names	2024-03-12 15:27:09 +01:00
Javier Segarra	ff6a1a9111	refs #6930 perf: remove logoutMultimedia acl	2024-03-12 13:39:01 +01:00
Jorge Penadés	10c2d25cbd	feat: refs #6492 create procedures & grant privileges	2024-03-12 12:57:34 +01:00
Carlos Satorres	106296be7b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6755-restoreRefactor	2024-03-12 12:55:56 +01:00
Javier Segarra	486b51bcfa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6930_scopedToken_Multimedia	2024-03-12 12:46:46 +01:00
Robert Ferrús	9624cdce60	Merge branch 'dev' into 6738-cleanTables2008Part2to2	2024-03-12 11:25:56 +00:00
Sergio De la torre	9d94259d67	refs #6078 feat: workerActivity	2024-03-12 12:21:46 +01:00
Javier Segarra	e7f6e61ea1	refs #5858: change notification owner	2024-03-12 10:20:43 +01:00
Sergio De la torre	375b690063	Merge branch 'dev' into 6078_workerActivty	2024-03-12 09:12:45 +00:00
Javier Segarra	c1d0ea7e27	refs #5858: breaklines	2024-03-12 09:40:42 +01:00
Javier Segarra	63a22a50f4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-12 09:37:41 +01:00
Jorge Penadés	5531639027	feat: refs #6951 create procedure	2024-03-12 09:34:12 +01:00
Guillermo Bonet	1d398a0acf	refactor: refs #7018 Added comment and minor changes	2024-03-12 08:40:11 +01:00
Guillermo Bonet	e2eddbaef7	refactor: refs #7018 Added comment	2024-03-12 08:35:13 +01:00
Guillermo Bonet	1bcb61a224	refactor: refs #7018 Mirated procs to vn	2024-03-12 08:25:58 +01:00
Guillermo Bonet	819bc7a56d	Merge pull request 'refactor: refs #6495 Migrated procs to vn' (!2108) from 6495-procRefactor4 into dev ... Reviewed-on: #2108 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-03-12 06:04:19 +00:00
Guillermo Bonet	516b4b364f	Merge branch 'dev' into 6499-procRefactor6	2024-03-11 13:36:34 +00:00
Pablo Natek	35dab518c8	Merge branch 'dev' into 6005-backupLabeler	2024-03-11 12:41:07 +00:00
Pablo Natek	421ca8654d	fix(changes): refs #6005 remove changes files	2024-03-11 13:39:03 +01:00
Guillermo Bonet	adafab5847	refactor: refs #6874 item_getSimilar	2024-03-11 13:27:18 +01:00
Guillermo Bonet	552a1a33c2	hotfix: itemProposal	2024-03-11 12:38:52 +01:00
Guillermo Bonet	a34be6ca02	Merge branch 'test' into dev	2024-03-11 12:21:54 +01:00
Robert Ferrús	9910ae5c64	fix: refs #6610 quitar variable	2024-03-11 12:12:02 +01:00
Pablo Natek	8529bed895	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler	2024-03-11 12:01:13 +01:00
Carlos Satorres	35c5e127d4	Merge branch '6842-sageMod' of https://gitea.verdnatura.es/verdnatura/salix into 6842-sageMod	2024-03-11 09:48:36 +01:00
Carlos Satorres	b051b0512f	refs #6842 fix fixtures	2024-03-11 09:48:29 +01:00
Jorge Penadés	e5387b0b65	fix: refs #5186 use date function	2024-03-11 09:14:05 +01:00
Jorge Penadés	4e8e7d3f4b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog	2024-03-11 08:59:26 +01:00
Alex Moreno	dcdad9c469	Merge branch 'dev' into 6925-invoice-transaction	2024-03-11 06:05:50 +00:00
Javier Segarra	18773f34de	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-09 11:27:57 +01:00
Javier Segarra	4994a836c7	refs #5858 feat: alter table util.notification	2024-03-09 11:27:29 +01:00
Robert Ferrús	b6af349d89	Merge branch '6610-hotFixDeleteTicketsWeekly' of https://gitea.verdnatura.es/verdnatura/salix into 6610-hotFixDeleteTicketsWeekly	2024-03-08 12:32:25 +01:00
Robert Ferrús	b1e90fabb2	refs #6610	2024-03-08 12:32:22 +01:00
Guillermo Bonet	1027ef6479	Merge branch 'dev' into 6495-procRefactor4	2024-03-08 11:31:54 +00:00
Robert Ferrús	05b60150a0	Merge branch 'master' into 6610-hotFixDeleteTicketsWeekly	2024-03-08 11:20:07 +00:00
Robert Ferrús	cdb9f372cf	feat: refs #6610 fixDeleteTickets	2024-03-08 12:19:57 +01:00
Jorge Penadés	76c5595a58	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog	2024-03-08 11:01:25 +01:00
Guillermo Bonet	74c199384c	fix: refs #6372 vn2008.clean	2024-03-08 10:42:07 +01:00
Guillermo Bonet	37e8518242	feat: refs #6372 Added saleLabel to vn.clean	2024-03-08 10:38:35 +01:00
Pablo Natek	2421cc7c68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler	2024-03-08 08:23:08 +01:00
Alex Moreno	89c55d23a4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-08 08:11:30 +01:00
David Domenech	60c50337ff	refs #6372	2024-03-08 07:43:13 +01:00
David Domenech	014914e1d9	refs #6372	2024-03-08 07:36:14 +01:00
Carlos Andrés	45bcf8043f	feat: permissions to vn.entry.isBooked refs#6724	2024-03-07 19:03:57 +01:00
Jorge Penadés	1e3967a4fe	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog	2024-03-07 15:56:02 +01:00
Carlos Satorres	557f1ec2d9	Merge branch 'dev' into 6842-sageMod	2024-03-07 13:40:37 +00:00
Pako Natek	b588b9807c	fixtures local	2024-03-07 13:45:53 +01:00
Alex Moreno	2f2aba1cc8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6925-invoice-transaction	2024-03-07 11:42:35 +01:00
Alex Moreno	ed39ede6cc	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-07 10:35:14 +01:00
Alex Moreno	f29212cb65	deploy: refs #6995 production dump	2024-03-07 10:34:24 +01:00
Alex Moreno	fbdebad12c	fix: refs #6995 desdeprecar unary_scan, unary_scan_line, unary_scan_line_buy, unary_scan_line_expedition	2024-03-07 10:29:31 +01:00
Alex Moreno	00355aba3a	fix: refs #6995 desdeprecar unary y unary_scan	2024-03-07 10:24:18 +01:00
Alex Moreno	3bfaa97ddd	fix: refs #6995remove preparation_exception	2024-03-07 10:18:30 +01:00
Alex Moreno	99c9ad77d2	fix: refs #6995 restore vn.exchangeInsuranceInPrevious	2024-03-07 10:07:42 +01:00
Alex Moreno	572a09f704	fix: refs #6995 restore vn.exchangeInsuranceInPrevious	2024-03-07 09:55:29 +01:00
Alex Moreno	b8f09f363f	fix: refs #6995 restore vn2008.jerarquia	2024-03-07 09:33:32 +01:00
Carlos Satorres	64d82d92d6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6755-restoreRefactor	2024-03-07 09:28:32 +01:00
Robert Ferrús	bf9842d5fd	Merge branch 'master' into rutasAnalyzeHotFix	2024-03-07 07:16:11 +00:00
Alex Moreno	a8c2779ee7	Merge branch 'master' into 6995-testToMaster_2410	2024-03-07 06:22:04 +00:00
Sergio De la torre	69ad44c0bd	Merge branch 'dev' into 6078_workerActivty	2024-03-07 07:18:16 +01:00
Guillermo Bonet	39b4e5db28	Merge branch 'dev' into 6948-bank	2024-03-07 06:17:26 +00:00
Guillermo Bonet	ee08502f33	Merge branch 'dev' into 6495-procRefactor4	2024-03-07 06:07:54 +00:00
Guillermo Bonet	cd40bd47e5	refactor: refs #6495 Deleted procs	2024-03-07 07:08:40 +01:00
Robert Ferrús	29926db45f	Merge branch 'master' into rutasAnalyzeHotFix	2024-03-07 06:01:37 +00:00
Javier Segarra	6c06f70121	Merge branch 'dev' into 6930_scopedToken_Multimedia	2024-03-06 18:18:34 +00:00
Carlos Andrés	f1654609df	Merge pull request 'test' (!2142) from test into dev ... Reviewed-on: #2142 Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>	2024-03-06 16:16:16 +00:00
Carlos Andrés	fc3c9332b3	Merge pull request 'master' (!2141) from master into test ... Reviewed-on: #2141 Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-03-06 16:10:42 +00:00
Sergio De la torre	dc6cfafd05	Merge branch 'dev' into 6607_checking_boxes	2024-03-06 16:03:24 +00:00
Carlos Andrés	c81749da78	feat: add column department.pbxQueue refs #6387	2024-03-06 16:38:34 +01:00
Ivan Mas	6b2533cfb1	refs #6498 correccion errores 2	2024-03-06 15:16:55 +01:00
Carlos Satorres	a14ab90d5a	refs #6755 fix restore add fixtures	2024-03-06 14:41:58 +01:00
Robert Ferrús	194947dc9a	feat: refs #6500 procRefactor8	2024-03-06 14:11:07 +01:00
Alex Moreno	9ab0228714	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6925-invoice-transaction	2024-03-06 13:58:10 +01:00
Carlos Satorres	58a239708d	refs #6842 remove sage	2024-03-06 13:11:41 +01:00
Carlos Satorres	6a13a33f84	min c	2024-03-06 13:09:41 +01:00
Carlos Satorres	a24445439a	remove v	2024-03-06 13:09:03 +01:00
Carlos Satorres	59a0cb3f4a	refs #6842 deprecated and move	2024-03-06 13:08:20 +01:00
Ivan Mas	492c6f4dd6	refs #6969 test	2024-03-06 12:50:44 +01:00
Ivan Mas	7947d6644e	refs #6498 Correcion errores	2024-03-06 12:44:59 +01:00
Sergio De la torre	49800a5cab	Merge branch 'dev' into 6607_checking_boxes	2024-03-06 11:36:05 +00:00
Sergio De la torre	010f585ed4	Merge branch 'dev' into 6193_inventory	2024-03-06 11:33:34 +00:00
Robert Ferrús	5ee78a6b8c	Merge branch 'dev' into 6500-procRefactor8	2024-03-06 11:06:40 +00:00
Robert Ferrús	276acf04fa	Merge branch '6500-procRefactor8' of https://gitea.verdnatura.es/verdnatura/salix into 6500-procRefactor8	2024-03-06 12:02:37 +01:00
Robert Ferrús	2f0c1612c2	feat: refs #6500 delete procedure	2024-03-06 12:02:34 +01:00
Javier Segarra	7999a9bf93	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-06 11:42:09 +01:00
Javier Segarra	eb5fdd1940	refs 5858 feat: replace with code	2024-03-06 11:41:48 +01:00
Javier Segarra	2f0c8d96d2	refs 5858 fix: resolve breaklines	2024-03-06 11:41:25 +01:00
Jorge Penadés	50a1d5b5ab	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-03-06 11:31:02 +01:00
Guillermo Bonet	094c00aabd	Merge branch 'dev' into 6495-procRefactor4	2024-03-06 10:17:45 +00:00
Ivan Mas	3cb45dd57b	Merge branch 'test' into 6969-Error_packaging-buyUltimateFromInterval	2024-03-06 10:08:50 +00:00
Jorge Penadés	f600a99708	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-03-06 10:55:05 +01:00
Sergio De la torre	5e6c4b21ba	Merge branch 'dev' into 6193_inventory	2024-03-06 09:44:07 +00:00
Sergio De la torre	922d106bbd	Merge branch 'dev' into 6607_checking_boxes	2024-03-06 09:43:39 +00:00
David Domenech	57c7f4d391	Merge branch 'dev' into 6874-item_getSimilar	2024-03-06 09:30:28 +00:00
Robert Ferrús	9c6db881b8	Merge branch 'dev' into 6500-procRefactor8	2024-03-06 09:12:45 +00:00
Alex Moreno	31dc2db838	Merge branch 'dev' into 6336-claimState_removeSome	2024-03-06 08:08:25 +00:00
Ivan Mas	354ecfaa16	refs #6498 Arreglar grant y tabs	2024-03-06 09:00:21 +01:00
Guillermo Bonet	4e28c315f7	Merge branch 'dev' into 6874-item_getSimilar	2024-03-06 06:14:13 +00:00
Carlos Andrés	66b7a3e8f5	feat: restricciones AWB para travel y entry refs #6960	2024-03-05 17:30:29 +01:00
Sergio De la torre	34572112ec	Merge branch 'dev' into 6193_inventory	2024-03-05 15:21:16 +00:00
Sergio De la torre	2d5aae3b40	Merge branch 'dev' into 6607_checking_boxes	2024-03-05 15:11:14 +00:00
Sergio De la torre	d397980efb	refs #6607 feat:[checking boxes]	2024-03-05 16:10:56 +01:00
Guillermo Bonet	f601c12468	refactor: refs #6948 Requested changes	2024-03-05 15:02:09 +01:00
Robert Ferrús	b353924034	Merge branch 'dev' into 6738-cleanTables2008Part2to2	2024-03-05 13:49:57 +00:00
Ivan Mas	f215ce5f05	refs #6498 Delete procedures vn2008 and grant vn procs	2024-03-05 14:33:16 +01:00
Robert Ferrús	5f16a9827c	feat: refs #6738 move file version	2024-03-05 14:17:58 +01:00
Ivan Mas	68846d3018	refs #6499 Refactor historico_multiple	2024-03-05 13:43:03 +01:00
Robert Ferrús	9992a8b4ff	Merge branch 'master' into rutasAnalyzeHotFix	2024-03-05 12:23:38 +00:00
Robert Ferrús	1580914567	Merge branch 'dev' into 6738-cleanTables2008Part2to2	2024-03-05 12:23:23 +00:00
Robert Ferrús	e83b0622cf	refs 6500 rateView	2024-03-05 13:21:53 +01:00
Pako Natek	9c14836bc7	BlueMonkey	2024-03-05 13:18:13 +01:00
Guillermo Bonet	950d7a2461	refactor: refs #6874 Changed params item_getSimilar	2024-03-05 12:48:39 +01:00
Robert Ferrús	9aad1dd6e8	feat: refs #6500 procRefactor8	2024-03-05 12:41:54 +01:00
Guillermo Bonet	00d5d06c6a	Merge branch 'test' into dev	2024-03-05 12:38:15 +01:00
Guillermo Bonet	85d3508848	Merge branch 'master' into test	2024-03-05 12:37:06 +01:00
Guillermo Bonet	d2f451c613	ticket #162561 hotfix	2024-03-05 12:33:28 +01:00
Sergio De la torre	cf181521d6	refs #6078 feat:add workeractivity	2024-03-05 11:53:57 +01:00
Sergio De la torre	726558d5a7	refs #6607 feat:[checking boxes]	2024-03-05 10:37:15 +01:00
Guillermo Bonet	55ba315858	refactor: refs #6948 Bank to Accouting	2024-03-05 10:30:25 +01:00
Guillermo Bonet	e0732835d0	refactor: refs #6948 Bank to Accouting	2024-03-05 10:25:23 +01:00
Jorge Penadés	0aa4add71b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-03-05 10:11:41 +01:00
Robert Ferrús	d668ae9904	refs #6738	2024-03-05 09:34:30 +01:00
Robert Ferrús	dc343a7e3b	feat: refs #6738 delete vn2008.dock	2024-03-05 09:33:48 +01:00
Guillermo Bonet	ab4d1a0437	Merge branch 'dev' into 6495-procRefactor4	2024-03-05 07:54:40 +00:00
Guillermo Bonet	619ac4e053	refactor: refs #6495 Requested changes	2024-03-05 08:55:40 +01:00
Robert Ferrús	0c9e11c0b2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6738-cleanTables2008Part2to2	2024-03-05 08:40:34 +01:00
Robert Ferrús	9a0b4ef674	feat: refs #6738 change table vn2008 to vn	2024-03-05 08:36:19 +01:00
Guillermo Bonet	05380df4f8	Merge pull request 'refactor: refs #6874 Proc itemProposal' (!2123) from 6874-itemProposalRefactor into dev ... Reviewed-on: #2123 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-05 06:35:04 +00:00
Robert Ferrús	c9b6cbf67b	fix: vDatedFrom y vDatedTo	2024-03-05 07:15:38 +01:00
Guillermo Bonet	489d126f79	Merge branch 'dev' into 6494-procRefactor3	2024-03-04 13:44:47 +00:00
Alex Moreno	5e794a7791	Merge branch 'dev' into 6336-claimState_removeSome	2024-03-04 13:15:50 +00:00
Alex Moreno	b761c258a1	refs #6336 feat(claimState): delete without using	2024-03-04 14:12:56 +01:00
Guillermo Bonet	2c7913a3be	Merge branch 'dev' into 6499-procRefactor7	2024-03-04 12:41:50 +00:00
Guillermo Bonet	fa70eeb75c	refactor: refs #6499 Requested changes	2024-03-04 13:42:11 +01:00
Guillermo Bonet	e65fc06a30	Merge branch 'dev' into 6494-procRefactor3	2024-03-04 12:33:49 +00:00
Guillermo Bonet	a96743c3b9	refactor: refs #6494 Requested changes	2024-03-04 13:34:42 +01:00
Guillermo Bonet	cf810fe497	refactor: refs #6874 Proc itemProposal	2024-03-04 13:14:41 +01:00
Guillermo Bonet	24efc1dd28	Merge branch 'dev' into 6874-itemProposalRefactor	2024-03-04 11:43:36 +00:00
Javier Segarra	753525d0ac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-04 11:57:16 +01:00
Javier Segarra	78c92af02f	refs #5858 feat: fix vn file	2024-03-04 11:57:10 +01:00
Robert Ferrús	5175c91b2d	fix: quitar delete	2024-03-04 11:51:55 +01:00
Jorge Penadés	9cff06ae3d	feat: refs #6276 acl itemBarcode delete	2024-03-04 09:30:07 +01:00
Ivan Mas	bd5d88f5ef	refs #6969 Error packaging	2024-03-04 08:41:09 +01:00
Guillermo Bonet	28dbb200fc	refactor: refs #6874 Proc itemProposal	2024-03-04 08:38:24 +01:00
Ivan Mas	1ccec1e0fb	refs #6499 procRefactor part 6	2024-03-04 08:11:06 +01:00
Robert Ferrús	31bd88e856	Merge branch 'master' into rutasAnalyzeHotFix	2024-03-04 06:56:58 +00:00
Guillermo Bonet	df7427d83c	Merge branch 'dev' into 6499-procRefactor7	2024-03-04 06:07:56 +00:00
Guillermo Bonet	b29a001c7f	Merge branch 'dev' into 6496-cleanVn2008	2024-03-04 06:07:53 +00:00
Guillermo Bonet	216f6f1db3	Merge branch 'dev' into 6495-procRefactor4	2024-03-04 06:07:30 +00:00
Guillermo Bonet	0b63991303	Merge branch 'dev' into 6494-procRefactor3	2024-03-04 06:07:24 +00:00
Alex Moreno	a3052c1cf9	refs #6925 hotFix(invoice) parenthesis & handle incoterms error	2024-03-01 15:05:12 +01:00
Juanjo Breso	c889353459	feat: refs#6493 modificar procedimiento balance_create	2024-03-01 14:37:14 +01:00
Carlos Andrés	292b77d57e	feat: restricciones AWB para travel y entry refs #6960	2024-03-01 14:36:49 +01:00
Carlos Andrés	b9e774cea0	feat: restricciones AWB para travel y entry refs #6960	2024-03-01 14:26:36 +01:00
Jorge Penadés	026c3c80a4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-03-01 13:48:00 +01:00
Robert Ferrús	5e2f9dd3d0	fix: poner nombres correcto	2024-03-01 12:58:48 +01:00
Robert Ferrús	19f8d1bb81	fix: poner nombres en camelCase	2024-03-01 12:57:34 +01:00
Robert Ferrús	87799fbc64	fix: rutasAnalyzeHotFix	2024-03-01 12:30:37 +01:00
Jorge Penadés	7d8d31022b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-03-01 12:29:55 +01:00
Jorge Penadés	3caed386e9	feat: refs #5186 add fixtures	2024-03-01 12:23:06 +01:00
Jorge Penadés	657430d28b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog	2024-03-01 12:15:49 +01:00
Robert Ferrús	8365d9b843	Merge branch 'dev' into 6959-sale_checkWithoutComponents	2024-03-01 10:32:16 +00:00
Guillermo Bonet	941e7da767	Merge branch 'dev' into 6494-procRefactor3	2024-03-01 10:23:08 +00:00
Guillermo Bonet	1f9f10323b	refactor: refs #6494 Migrated and deleted residual procs	2024-03-01 11:21:04 +01:00
Pablo Natek	6aa68afd8f	Merge pull request 'remove(claimRma): refs #6349 remove' (!2100) from 6349-deleteClaimRma into dev ... Reviewed-on: #2100 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-01 07:39:06 +00:00
Guillermo Bonet	3dd4d48557	refactor: refs #6495 Deleted residual procs	2024-03-01 07:47:15 +01:00
Guillermo Bonet	f4aa5cea91	refactor: refs #6499 Grants	2024-03-01 07:32:45 +01:00
Jorge Penadés	7b0bed209e	feat: refs #5186 add acl & model	2024-02-29 16:27:42 +01:00
Jorge Penadés	1927878184	fix: refs #5186 drop SaleGroup from ticketLog	2024-02-29 16:04:16 +01:00
Jorge Penadés	c54c9ce913	fix: refs #5186 create parkingLog & add sector relation	2024-02-29 14:43:37 +01:00
Javier Segarra	95fa776e41	refs 5858 feat: sql files	2024-02-29 12:49:50 +00:00
Guillermo Bonet	625d19e88c	hotfix: Autoincrement warehouse	2024-02-29 13:44:58 +01:00
Robert Ferrús	594780d6cb	feat: refs #6958 delete sale_checkNoComponents	2024-02-29 13:44:49 +01:00
Pako Natek	2f275d8f32	itemType add	2024-02-29 13:06:26 +01:00
Juanjo Breso	e047d445d3	feat: refs#6493 modificado entry_getTransfer	2024-02-29 12:00:43 +01:00
Juanjo Breso	ecd7e8eb98	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte2	2024-02-29 11:59:13 +01:00
Robert Ferrús	624c214178	fix: refs #6777 Fixed version	2024-02-29 10:46:08 +01:00
Javier Segarra	8e976d2e4f	refs #5858 feat: remove Schedule system	2024-02-29 09:28:27 +01:00
Robert Ferrús	311401daba	fix: refs #6777 ticketMRW	2024-02-29 08:59:25 +01:00
Robert Ferrús	41d7f4d25e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6777-changeDependenciesVn2008toVnPart7	2024-02-29 08:28:10 +01:00
Javier Segarra	becd2e6f48	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-02-29 07:49:24 +01:00
Guillermo Bonet	01fb865a76	Merge branch 'dev' into 6495-procRefactor4	2024-02-29 06:36:43 +00:00
Guillermo Bonet	b4ae5a0a3b	Merge branch 'dev' into 6499-procRefactor7	2024-02-29 06:36:33 +00:00
Guillermo Bonet	96bab9b27d	refactor: refs #6496 Requested changes	2024-02-29 07:37:23 +01:00
Guillermo Bonet	a2dc65cb31	Merge branch 'dev' into 6496-cleanVn2008	2024-02-29 06:32:05 +00:00
Guillermo Bonet	7a43ccaa36	refactor: refs #6496 Requested changes	2024-02-29 07:32:19 +01:00
Carlos Satorres	de9787642d	Merge branch '5858-fiscalData-validations' of https://gitea.verdnatura.es/verdnatura/salix into 5858-fiscalData-validations	2024-02-28 14:05:45 +01:00