4492 Commits

Author	SHA1	Message	Date
Javier Segarra	d638e31a1a	Merge branch 'dev' into 6321_negative_tickets	2024-04-23 19:15:45 +02:00
Carlos Andrés	26fd1ae6c9	Merge pull request 'test' (!2359) from test into dev ... Reviewed-on: #2359	2024-04-23 15:53:13 +00:00
Carlos Andrés	a7f1188975	Merge pull request 'master' (!2358) from master into test ... Reviewed-on: #2358 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-04-23 15:35:33 +00:00
Carlos Andrés	033bcf6b67	hotfix importErrorNotification refs #6189	2024-04-23 17:24:47 +02:00
Guillermo Bonet	e0393a6e72	Merge branch 'test' into dev	2024-04-23 14:43:19 +02:00
Guillermo Bonet	f5844ff426	Merge branch 'master' into test	2024-04-23 14:42:57 +02:00
Guillermo Bonet	ec23cc7619	hotfix: entry_checkBooked	2024-04-23 14:41:43 +02:00
Guillermo Bonet	afe2669b27	Merge branch 'test' into dev	2024-04-23 13:57:42 +02:00
Guillermo Bonet	36c8a8db0f	Merge branch 'master' into test	2024-04-23 13:57:18 +02:00
Ivan Mas	e7055e2428	Merge branch 'dev' into 7032-Delete-vn.recipeCook	2024-04-23 10:26:42 +00:00
Carlos Andrés	2d5daf55c2	Merge pull request 'feat: Varias líneas farming en albaranes refs #7020' (!2349) from 7020-Varias-líneas-farming-en-albaranes into dev ... Reviewed-on: #2349 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-23 10:04:08 +00:00
Guillermo Bonet	8dd4ac9119	hotfix: Throw msg and entry_updateComission start transaction	2024-04-23 11:50:48 +02:00
Javier Segarra	caaa4fdd30	Merge remote-tracking branch 'origin/dev' into 6321_negative_tickets	2024-04-23 11:45:59 +02:00
Alex Moreno	85491613b0	test: refs #7173 fix fixtures	2024-04-23 08:47:28 +02:00
Juan Ferrer	d58607f26e	Merge branch 'dev' into 4409-binlog	2024-04-22 19:43:48 +00:00
Carlos Andrés	8bb331f0ed	feat: Varias líneas farming en albaranes refs #7020	2024-04-22 19:57:17 +02:00
Ivan Mas	9899efab97	refs #7032 Delete vn.recipe_Cook	2024-04-22 17:55:49 +02:00
Javier Segarra	5a5032f6e6	Merge remote-tracking branch 'origin/dev' into 6321_negative_tickets	2024-04-22 13:34:06 +02:00
Ivan Mas	f380e0d1ce	Merge branch 'dev' into 7021-Delete_rfid_schema	2024-04-22 11:17:54 +00:00
Guillermo Bonet	eb9f81c81d	feat #7181 Rollback creditInsurance_getRisk	2024-04-22 13:05:16 +02:00
Ivan Mas	1ef98ecd8c	Merge branch 'dev' into 7021-Delete_rfid_schema	2024-04-22 10:37:15 +00:00
Sergio De la torre	0f05fe5d93	Merge branch 'dev' into 6921_addFromDelivery	2024-04-22 10:32:03 +00:00
Robert Ferrús	debd163b3f	Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7	2024-04-22 10:16:01 +00:00
Robert Ferrús	6bb36e0d82	Merge branch 'dev' into 7029-packagingVolumeRestriction	2024-04-22 09:53:51 +00:00
Robert Ferrús	b0289d2e18	Merge pull request 'test' (!2344) from test into dev ... Reviewed-on: #2344 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-22 09:34:45 +00:00
Robert Ferrús	b88dff0d99	feat: refs #6777	2024-04-22 10:48:37 +02:00
Sergio De la torre	23fa74a5ad	Merge branch 'dev' into 6921_addFromDelivery	2024-04-22 08:11:37 +00:00
Robert Ferrús	e8d7f20221	Merge branch 'master' into 174903-item_getSimilar	2024-04-22 07:43:39 +00:00
Robert Ferrús	a1a3470df4	feat: refs #174903	2024-04-22 09:43:13 +02:00
Robert Ferrús	6a0a944319	Merge branch 'dev' into 7029-packagingVolumeRestriction	2024-04-22 07:23:18 +00:00
Juan Ferrer	739ae82ace	fix(binlog): refs #4409 Fix cursor name	2024-04-22 09:02:43 +02:00
Juan Ferrer	bc45cafb40	Merge branch 'dev' into 4409-binlog	2024-04-22 08:54:14 +02:00
Robert Ferrús	e09b828d88	Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7	2024-04-22 05:49:53 +00:00
Sergio De la torre	081c97828c	Merge branch 'master' into hotFix_Ubicador	2024-04-22 05:08:59 +00:00
Guillermo Bonet	e7f81e99bc	Merge branch 'test' into dev	2024-04-19 14:40:26 +02:00
Juan Ferrer	a0126748e2	fix(binlog): refs #4409 Fix fixtures cursor name	2024-04-19 14:19:34 +02:00
Guillermo Bonet	65892625d5	feat: #7231 Collection_assing more time and throw	2024-04-19 14:17:49 +02:00
Ivan Mas	ad317cb5e5	refs #7021 Delete rfid schema	2024-04-19 14:11:35 +02:00
Carlos Andrés	e0cd08b280	fix: hotfix importar A3 Ticket 175840	2024-04-19 14:10:11 +02:00
Sergio De la torre	e6258dc9e5	refs #6413 hotFix fix:ubicadorChecking	2024-04-19 13:03:57 +02:00
Robert Ferrús	5b027a88fa	feat: refs #6777 restore view	2024-04-19 11:33:33 +02:00
Robert Ferrús	e601310d3e	feat: refs #6777 restore view	2024-04-19 11:27:54 +02:00
Robert Ferrús	28c08d8b18	feat: refs #7237 company_getSuppliersDebt	2024-04-19 10:58:19 +02:00
Robert Ferrús	fb17a54ebd	feat: refs #6777 resotre view	2024-04-19 10:53:03 +02:00
Robert Ferrús	c375223ae5	Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7	2024-04-19 05:23:23 +00:00
Sergio De la torre	f4afda8cb2	Merge branch 'dev' into 6921_addFromDelivery	2024-04-18 14:52:57 +00:00
Robert Ferrús	f269d41596	Merge branch 'master' into 174903-item_getSimilar	2024-04-18 12:52:52 +00:00
Guillermo Bonet	bb8379f8db	refactor: refs #6724 Minor change	2024-04-18 14:42:29 +02:00
Robert Ferrús	4f7d315719	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6777-changeDependenciesVn2008toVnPart7	2024-04-18 14:07:23 +02:00
Guillermo Bonet	8f9adbb37c	Merge branch 'test' into dev	2024-04-18 13:55:22 +02:00