565 Commits

Author	SHA1	Message	Date
Guillermo Bonet	0d50f5b405	Merge pull request 'master' (!2315) from master into test ... Reviewed-on: #2315 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-17 10:20:20 +00:00
Robert Ferrús	3e5b6a9ad1	Merge branch 'dev' into 6500-procRefactor8	2024-04-17 09:01:39 +00:00
Robert Ferrús	8ca278b5a9	feat: refs #6500 cambios solicitados	2024-04-17 11:00:00 +02:00
Robert Ferrús	0a4cd4d4d0	feat: company_getSuppliersDebtHotFix	2024-04-17 09:58:27 +02:00
Guillermo Bonet	9f9662924d	Merge pull request 'feat: refs #6968 Changed groupingMode to enum' (!2306) from 6968-groupingModeRefactor into dev ... Reviewed-on: #2306 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-17 06:48:43 +00:00
Juanjo Breso	3950d60387	feat: refs#6493 Cambios solicitados procedimientos	2024-04-17 07:37:58 +02:00
Juanjo Breso	97c0db62ac	Merge branch '6493-refactorizar-procedimientos-vn2008-parte_2' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-17 07:33:11 +02:00
Juanjo Breso	187c918a21	feat: refs#6493 Cambios solicitados procedimientos	2024-04-17 07:33:08 +02:00
Juanjo Breso	81b2e89fd8	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-17 05:30:39 +00:00
Guillermo Bonet	36bf770ed4	Merge pull request 'feat: refs #7173 Bloquear facturas recibidas contabilizadas' (!2258) from 7173-Restricción-eliminar/modificar-vn.invoiceIn into dev ... Reviewed-on: #2258 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-17 05:17:36 +00:00
Guillermo Bonet	d92d373db4	Merge branch 'dev' into 6968-groupingModeRefactor	2024-04-17 05:15:37 +00:00
Guillermo Bonet	c8e7706652	feat: refs #6968 Requested changes	2024-04-17 07:15:24 +02:00
Robert Ferrús	01d959f6f4	feat: refs #7219	2024-04-16 12:46:50 +02:00
Guillermo Bonet	7a557be09a	feat: refs #6968 Changed groupingMode to enum	2024-04-16 11:07:57 +02:00
Guillermo Bonet	45fac06c6b	feat: refs #7173 Added restrictions in invoiceIn structure	2024-04-16 08:58:26 +02:00
Guillermo Bonet	91d5f51e73	Merge branch '7173-Restricción-eliminar/modificar-vn.invoiceIn' of https://gitea.verdnatura.es/verdnatura/salix into 7173-Restricción-eliminar/modificar-vn.invoiceIn	2024-04-16 08:44:51 +02:00
Guillermo Bonet	93abfdd8a1	feat: refs #7173 Added restrictions in invoiceIn structure	2024-04-16 08:44:50 +02:00
Guillermo Bonet	0c24e67af1	Merge branch 'dev' into 7173-Restricción-eliminar/modificar-vn.invoiceIn	2024-04-16 05:42:59 +00:00
Ivan Mas	5bb3dccd19	Merge branch 'dev' into 7161DeleteitemTrash	2024-04-15 14:03:42 +00:00
Ivan Mas	6e183b7426	refs #7161 change vAddress to vAddressShortage	2024-04-15 15:59:05 +02:00
Juan Ferrer	133d45eecf	Merge branch 'dev' into 4409-binlog	2024-04-15 10:22:04 +02:00
Robert Ferrús	f30f907d8e	feat: refs #6500 cambios solicitados	2024-04-12 12:13:07 +02:00
Robert Ferrús	adadf70f1e	feat: refs #6500	2024-04-12 08:44:06 +02:00
Robert Ferrús	800fa36d04	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6500-procRefactor8	2024-04-12 08:40:50 +02:00
Robert Ferrús	f545a57c9f	feat: refs #6500	2024-04-12 07:58:18 +02:00
Guillermo Bonet	d86bb6b004	Merge pull request 'refactor: refs #7181 vn2008.Deleted risk_vs_client_list' (!2283) from 7181-risk_vs_client_list into dev ... Reviewed-on: #2283 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-12 05:18:06 +00:00
Guillermo Bonet	2226922366	Merge branch 'master' into test	2024-04-11 14:52:16 +02:00
Robert Ferrús	04c5a9a004	Merge branch 'dev' into 6500-procRefactor8	2024-04-11 12:21:32 +00:00
Juanjo Breso	aee638c3a9	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-11 11:43:07 +00:00
Guillermo Bonet	c190d2bef1	Merge branch 'master' into ticket168996-hotfix	2024-04-11 07:31:31 +00:00
Guillermo Bonet	c9b2bb5b5e	Merge branch 'dev' into 7181-risk_vs_client_list	2024-04-11 07:29:32 +00:00
Guillermo Bonet	b1dc5efc8b	refactor: refs #7181 Requested changes	2024-04-11 09:29:25 +02:00
Alex Moreno	3635a4b6d0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-04-11 07:46:16 +02:00
Pablo Natek	b2c3442c12	Merge branch 'master' into 7024-fixInventorryError	2024-04-11 05:33:44 +00:00
Pablo Natek	68ca5d369c	fix: refs #7024 fix error on setting local variable	2024-04-11 07:33:31 +02:00
Guillermo Bonet	7b3472aa0b	refactor: refs #7181 Minor change	2024-04-10 14:23:24 +02:00
Pablo Natek	2c5c2ca5a7	fix: refs #7024 fix condition sintax	2024-04-10 14:17:08 +02:00
Guillermo Bonet	5044cd454d	refactor: refs #7181 vn2008.Deleted risk_vs_client_list	2024-04-10 14:17:03 +02:00
Robert Ferrús	e2eff4df54	Merge branch 'dev' into 6500-procRefactor8	2024-04-10 12:04:40 +00:00
Pablo Natek	2e15b35fd1	fix: refs #7024 create exception for inventory	2024-04-10 14:01:03 +02:00
Robert Ferrús	7c550f1dbc	Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7	2024-04-10 11:06:32 +00:00
Guillermo Bonet	1fe783cf0e	hotfix: ticket168996 Now ticket_doCmr ignore deliveryMethod	2024-04-10 12:00:52 +02:00
Juanjo Breso	2d4524a34c	feat: refs#6493 Cambios solicitados procedimientos	2024-04-10 09:00:41 +02:00
Jorge Penadés	a3c1bceb7e	refactor: refs #6492 use enum	2024-04-09 15:57:34 +02:00
Jorge Penadés	dca75437f1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008	2024-04-09 15:20:30 +02:00
Robert Ferrús	d151d57613	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6777-changeDependenciesVn2008toVnPart7	2024-04-09 14:25:48 +02:00
Ivan Mas	90c26959af	refs #7161 change longName to name	2024-04-09 13:39:33 +02:00
Ivan Mas	b75af7b192	Merge branch 'dev' into 7161DeleteitemTrash	2024-04-09 11:22:32 +00:00
Guillermo Bonet	0e2e68488d	Merge branch 'test' into dev	2024-04-09 13:08:54 +02:00
Robert Ferrús	c6ece4619f	feat: refs #6500	2024-04-09 11:40:12 +02:00
Jorge Penadés	9a28a59d00	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008	2024-04-09 11:11:30 +02:00
Sergio De la torre	75293fbb9a	refs #6276 hotFix:itemShelving_add	2024-04-09 07:38:28 +02:00
Robert Ferrús	1743f7501a	Merge branch 'dev' into 6500-procRefactor8	2024-04-09 05:37:18 +00:00
Robert Ferrús	2c0c346a7b	feat: refs #6500	2024-04-09 07:34:43 +02:00
Juanjo Breso	1534402640	feat: refs#6493 Cambios solicitados procedimientos	2024-04-08 13:28:56 +02:00
Juan Ferrer	9da9478daf	Merge branch 'dev' into 4409-binlog	2024-04-08 13:11:59 +02:00
Juanjo Breso	351d5b5ba3	Merge branch '6493-refactorizar-procedimientos-vn2008-parte_2' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-08 12:57:03 +02:00
Juanjo Breso	d3df3e3376	feat: refs#6493 Cambios solicitados procedimientos	2024-04-08 12:57:01 +02:00
Juanjo Breso	eab1bfe6ab	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-08 10:43:39 +00:00
Carlos Andrés	5558e92b1e	Merge pull request 'fix: closeTicket idem salix refs #6549' (!2163) from 6549-ticket_close into dev ... Reviewed-on: #2163 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-08 10:36:21 +00:00
Robert Ferrús	2d18f01a15	feat: refs #6500	2024-04-08 12:18:13 +02:00
Robert Ferrús	dddcacee7a	feat: refs #6500	2024-04-08 12:01:27 +02:00
Robert Ferrús	2037b17f4e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6500-procRefactor8	2024-04-08 11:57:00 +02:00
Juanjo Breso	92cd61460e	feat: refs#6493 Cambios solicitados procedimientos	2024-04-08 09:56:36 +02:00
Guillermo Bonet	0b96471c7d	feat: refs #6714 Added businessType zone_getAddresses	2024-04-08 09:27:07 +02:00
Juan Ferrer	283d8b1241	feat: refs #4409 Disable old available triggers	2024-04-08 09:11:40 +02:00
Juanjo Breso	55949d0979	feat: refs#6493 Cambios solicitados procedimientos	2024-04-08 07:44:45 +02:00
Alex Moreno	93000aaecf	Merge branch 'dev' into 6549-ticket_close	2024-04-05 12:20:09 +00:00
Juanjo Breso	07b45748f0	Merge branch '6493-refactorizar-procedimientos-vn2008-parte_2' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-05 12:58:36 +02:00
Juanjo Breso	c74aea74bc	feat: refs#6493 modificaciones solicitadas.	2024-04-05 12:58:31 +02:00
Juanjo Breso	f316ca6974	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-05 10:55:20 +00:00
Guillermo Bonet	0cd4013f5e	Merge branch 'test' into dev	2024-04-05 07:51:19 +02:00
Guillermo Bonet	7ea917dc4d	hotfix: #6875 packing DEFAULT 1	2024-04-05 07:49:37 +02:00
Carlos Andrés	d18721f50d	feat: bloquear facturas recibidas contabilizadas refs #7173	2024-04-04 18:05:45 +02:00
Carlos Andrés	bd661befb6	feat: bloquear facturas recibidas contabilizadas refs #7173	2024-04-04 15:04:23 +02:00
Robert Ferrús	9801279370	refs #169673 item_getSimilar	2024-04-04 13:28:29 +02:00
Guillermo Bonet	29eee4e8a7	Merge branch 'test' into dev	2024-04-04 11:30:03 +02:00
Guillermo Bonet	8702a6808c	hotfix: #7024 Modified duaInvoiceInBooking	2024-04-04 11:25:03 +02:00
Alex Moreno	ff2e00c51c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-04-03 16:24:45 +02:00
Ivan Mas	b9520b53ab	hotfix_clientsDisable	2024-04-03 10:03:59 +02:00
Javi Gallego	d71f3e0818	test	2024-04-03 09:02:34 +02:00
Javi Gallego	52457b9642	feat: sin concatenar en el nombre	2024-04-03 07:09:07 +02:00
Juanjo Breso	4767b98442	Merge branch '6493--refactorizar-procedimientos-vn2008-parte2' into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-02 10:59:25 +02:00
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
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