21234 Commits

All Branches

Search

Author	SHA1	Message	Date
Pako Natek	b5402a3f2f	defaultSector	2024-05-03 10:44:57 +02:00
Robert Ferrús	cdb0bf28c2	Merge pull request 'feat: refs #7325 item_getBalance' (!2397) from 7325-item_getBalance into dev ... Reviewed-on: #2397 Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>	2024-05-03 06:04:47 +00:00
Robert Ferrús	b6e4130184	feat: refs #7325 item_getBalance	2024-05-03 07:51:04 +02:00
Carlos Satorres	6e5c791a51	Merge pull request '6895-removeShelving' (!2388) from 6895-removeShelving into dev ... Reviewed-on: #2388 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-02 11:43:35 +00:00
Carlos Satorres	11ffc3a652	Merge branch 'dev' into 6895-removeShelving	2024-05-02 11:40:55 +00:00
Carlos Satorres	7ced8dc54a	Merge pull request '6870-modifyDefaulterNotification' (!2383) from 6870-modifyDefaulterNotification into dev ... Reviewed-on: #2383 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-02 11:32:01 +00:00
Carlos Satorres	ee41e5b6ac	Merge branch 'dev' into 6895-removeShelving	2024-05-02 10:47:38 +00:00
Carlos Satorres	9e2332ca4a	refs #6895 state home	2024-05-02 12:48:11 +02:00
Carlos Satorres	a43593f63b	Merge branch 'dev' into 6870-modifyDefaulterNotification	2024-05-02 10:42:00 +00:00
Carlos Satorres	def1521131	refs #6870 defaulter id	2024-05-02 12:42:17 +02:00
Carlos Satorres	ae15f4b5d1	refs #6870 markdown	2024-05-02 12:14:39 +02:00
Guillermo Bonet	0ab79728b5	Merge branch 'test' into dev	2024-05-02 08:10:20 +02:00
Guillermo Bonet	7eb2e8f218	Merge branch 'master' into test	2024-05-02 08:09:59 +02:00
Guillermo Bonet	b926725021	hotfix: ticket#179915 Fix no worker exists	2024-05-02 08:04:44 +02:00
Carlos Satorres	b66111a032	refs #6895 remove tfront	2024-04-30 13:33:46 +02:00
Carlos Satorres	b0b8f12ca9	refs #6895 remove code	2024-04-30 13:17:19 +02:00
Carlos Satorres	e546a13e5d	refs #6895 redirect lilium	2024-04-30 12:41:29 +02:00
Jon Elias	2b9bfb5d85	Merge pull request 'fix: refs #6731 fix ticketRequest' (!2364) from 6731-fixTicketRequestLog into dev ... Reviewed-on: #2364 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-30 10:19:29 +00:00
Alex Moreno	d18f08e676	hotFix(addSaleByCode) add userId	2024-04-30 12:15:27 +02:00
Guillermo Bonet	f10ecf4f00	Merge branch 'test' into dev	2024-04-30 11:47:55 +02:00
Guillermo Bonet	c987bb6e66	Merge branch 'master' into test	2024-04-30 11:47:35 +02:00
Guillermo Bonet	d44b8f7c9a	hotfix: ticket #179514 ticket_close packaging fix	2024-04-30 11:44:16 +02:00
Guillermo Bonet	110cae3171	Merge pull request 'refactor: #6997 Deleted vn.client.eypbc' (!2353) from 6997-eypbc into dev ... Reviewed-on: #2353 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-30 08:23:52 +00:00
Carlos Andrés	2b6d4198ad	Merge pull request 'Hotfix-create-proc-to-kill-connection' (!2385) from Hotfix-create-proc-to-kill-connection into master ... Reviewed-on: #2385 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-04-30 07:06:43 +00:00
Guillermo Bonet	80b44ccace	Merge pull request 'refactor: refs #7258 Deleted all dependences of vn2008 schema' (!2362) from 7258-lastChangesMigrationVn2008 into dev ... Reviewed-on: #2362 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-30 05:37:33 +00:00
Carlos Andrés	e934b47e98	Hotfix feat: new function to kill connections	2024-04-29 17:09:51 +02:00
Carlos Andrés	e55658e6b3	Hotfix feat: new function to kill connections	2024-04-29 17:02:47 +02:00
Carlos Andrés	21a1e1eed3	Hotfix feat: new function to kill connections	2024-04-29 16:59:56 +02:00
Carlos Andrés	8c7f8a43a7	Merge pull request 'hotFix collection_assign' (!2384) from hotfix-eliminar-vLockTime-collection_assign into master ... Reviewed-on: #2384 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-29 13:02:56 +00:00
Carlos Andrés	7b7afb05c5	hotfix collection_assign	2024-04-29 15:01:20 +02:00
Carlos Andrés	51c8736da2	hotFix collection_assign	2024-04-29 14:54:15 +02:00
Carlos Andrés	dcb6f90ab3	hotfix collection_assign elimino vLockTime	2024-04-29 14:42:16 +02:00
Carlos Satorres	ace39b92ac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6870-modifyDefaulterNotification	2024-04-29 12:14:38 +02:00
Carlos Satorres	f3c7b1e89c	refs #6870 add observationEmail	2024-04-29 11:59:51 +02:00
Sergio De la torre	e1fe1cef7f	Merge pull request '6275_getExpeditionSummary' (!2381) from 6275_getExpeditionSummary into master ... Reviewed-on: #2381 Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-04-29 09:24:50 +00:00
Sergio De la torre	a180f54390	refs #6275 hotFix fix:getExpeditionSummary	2024-04-29 08:59:12 +02:00
Sergio De la torre	f4767728bc	refs #6275 hotFix fix:getExpeditionSummary	2024-04-29 08:20:57 +02:00
Sergio De la torre	f2225b49a7	refs #6275 hotFix fix:getExpeditionSummary	2024-04-29 08:19:18 +02:00
Pako Natek	bb4f97102e	Merge pull request 'hotFix' (!2380) from hotFix-GET_LOCK into master ... Reviewed-on: #2380 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-27 11:14:59 +00:00
Pako Natek	9aa6e3f80a	hotfix	2024-04-27 13:09:15 +02:00
Pako Natek	97142bf976	Merge pull request 'hotFix' (!2379) from hotFix-GET_LOCK-TEST into test ... Reviewed-on: #2379 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-27 10:57:04 +00:00
Pako Natek	3440bb1725	hotFix	2024-04-27 12:43:15 +02:00
Pako Natek	9e87b055b7	hotFix	2024-04-27 12:36:21 +02:00
Jorge Penadés	7ee279cb31	Merge pull request '#7019 warmfix e2e' (!2376) from 7019-warmfix-createInvoiceOut into dev ... Reviewed-on: #2376 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-26 12:21:16 +00:00
Robert Ferrús	b129d25230	Merge pull request 'fix: refs #177968 restore restriction' (!2375) from 177968-hotFixSale_replaceItem into master ... Reviewed-on: #2375 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-26 08:54:36 +00:00
Jorge Penadés	1e5c90e921	fix: refs #7019 e2e	2024-04-26 09:30:20 +02:00
Robert Ferrús	c819b92141	fix: refs #177968 restore restriction	2024-04-26 09:09:22 +02:00
Pablo Natek	17ed4b7f08	Merge pull request '#4988 - new-module-agency' (!2303) from 4988-new-module-agency into dev ... Reviewed-on: #2303 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-26 07:06:55 +00:00
Carlos Satorres	dab69cc9a3	Merge pull request '6976-supplierConsumption' (!2365) from 6976-supplierConsumption into dev ... Reviewed-on: #2365 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-26 07:04:53 +00:00
Carlos Satorres	e2696cd883	Merge branch 'dev' into 6976-supplierConsumption	2024-04-26 06:58:36 +00:00