24001 Commits

All Branches

Search

Author	SHA1	Message	Date
Sergio De la torre	3a8dcbfd29	refs #6861 feat:reserve previos	2024-04-11 13:45:43 +02:00
Juanjo Breso	aee638c3a9	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-11 11:43:07 +00:00
Jorge Penadés	86ba8c9fcb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables	2024-04-11 13:40:51 +02:00
Pako Natek	5285ff6557	Merge pull request 'moreProcs' (!2289) from 6021-floranet_moreLostProcs into dev ... Reviewed-on: #2289	2024-04-11 11:30:21 +00:00
Pako Natek	0298f3235c	Merge pull request 'recovering procs' (!2288) from 6021-floranet_lostProcs into dev ... Reviewed-on: #2288 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-11 11:25:46 +00:00
Pako Natek	9de4095260	moreProcs	2024-04-11 13:25:43 +02:00
Pako Natek	bff3aef73b	recovering procs	2024-04-11 13:20:41 +02:00
Sergio De la torre	9a98c872d4	Merge branch '5890-itemShelving_asignado' into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-04-11 12:34:49 +02:00
Sergio De la torre	b4776727df	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-04-11 12:32:30 +02:00
Sergio De la torre	bc1397d916	refs #6861 feat: reservePrevious	2024-04-11 12:27:16 +02:00
Sergio De la torre	68fa64a937	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-04-11 12:24:00 +02:00
Carlos Andrés	5967bd545c	feat: previas con reserva refs #6861	2024-04-11 12:16:00 +02: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	7ddc0b087e	deploy: refs #7199 init version 2418	2024-04-11 08:28:43 +02:00
Alex Moreno	01425bd95e	Merge pull request '7199-devToTest_2316' (!2287) from 7199-devToTest_2316 into test ... Reviewed-on: #2287 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-11 06:25:22 +00:00
Alex Moreno	c27585d6f3	deploy: refs #7199	2024-04-11 08:20:11 +02:00
Pablo Natek	c008614139	Merge pull request 'fix: refs #7024 fix error on setting local variable' (!2286) from 7024-fixInventorryError into master ... Reviewed-on: #2286 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-11 05:55:34 +00: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
Pablo Natek	4c2721b0c5	Merge pull request 'master' (!2285) from master into test ... Reviewed-on: #2285 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-11 05:16:37 +00:00
Sergio De la torre	d998b650da	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-04-11 07:06:40 +02:00
Juan Ferrer	ce55058314	feat(pbx): refs #7198 country prefix, schedule	2024-04-10 18:14:10 +02:00
Ivan Mas	7ceba23957	Merge pull request 'refs #6827 Check usernames special characters' (!2109) from 6827-check-usernames-special-characters into dev ... Reviewed-on: #2109 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-04-10 15:23:40 +00:00
Ivan Mas	83befbd120	Merge branch 'dev' into 6827-check-usernames-special-characters	2024-04-10 15:21:42 +00:00
Pablo Natek	e3feefefd7	Merge pull request 'fix: refs #7024 create exception for inventory' (!2282) from 7024-create-exception-for-inventory into master ... Reviewed-on: #2282 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-10 12:56:09 +00: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
Ivan Mas	b0b71935da	Merge pull request 'refs #6732 change Proveedores isReal' (!2281) from 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal into dev ... Reviewed-on: #2281 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-10 12:06:41 +00:00
Ivan Mas	08948ad360	Merge branch 'dev' into 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal	2024-04-10 12:05:04 +00: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
Ivan Mas	0b7042d597	refs #6732 change Proveedores isReal	2024-04-10 13:55:25 +02:00
Ivan Mas	bd026af917	Merge pull request 'refs #6732 change name supplier.isSerious to supplier.isReal' (!2063) from 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal into dev ... Reviewed-on: #2063 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-10 11:21:19 +00:00
Ivan Mas	85301b84bc	Merge branch 'dev' into 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal	2024-04-10 11:18:31 +00:00
jcasado	0cf1ced747	remove focus	2024-04-10 13:17:43 +02:00
jcasado	7d925bac87	refs #6641 fix PR changes	2024-04-10 13:16:41 +02:00
Pablo Natek	11bbb716d3	Merge branch '6005-backupLabeler' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler	2024-04-10 13:09:32 +02:00
Pablo Natek	c581deef66	refactor: refs #6005 refactor spec	2024-04-10 13:09:31 +02:00
Robert Ferrús	7c550f1dbc	Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7	2024-04-10 11:06:32 +00:00
Sergio De la torre	0ef7082249	Merge branch 'dev' into 6921_addFromDelivery	2024-04-10 10:02:57 +00:00
Sergio De la torre	9c373d9ef3	refs #6921 feat: getTicketsObservations	2024-04-10 12:02:25 +02:00
Guillermo Bonet	1fe783cf0e	hotfix: ticket168996 Now ticket_doCmr ignore deliveryMethod	2024-04-10 12:00:52 +02:00
Jorge Penadés	0f5afc908c	Merge pull request '#6492 refactor vn2008 procedures' (!2159) from 6492-refactorProceduresVn2008 into dev ... Reviewed-on: #2159 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-10 09:42:06 +00:00
Jorge Penadés	914d3b2c67	feat: refs #6449 add showId column	2024-04-10 11:41:08 +02:00
Sergio De la torre	b46102653b	refs #6921 feat: addFromDelivery	2024-04-10 11:35:28 +02:00
Sergio De la torre	0956dbc7b1	refs #6921 feat: addFromDelivery	2024-04-10 11:32:45 +02:00