5310 Commits

Author	SHA1	Message	Date
Guillermo Bonet	5a9850939e	Merge branch 'master' into test	2024-07-04 09:26:00 +02:00
Guillermo Bonet	009dcd8fc7	refs #7486 Fix tests	2024-07-04 09:23:57 +02:00
Guillermo Bonet	af6422cf05	Merge branch 'master' into test	2024-07-04 07:43:58 +02:00
Guillermo Bonet	a7b653c42a	refs #7486 Fix collection_new	2024-07-04 07:34:41 +02:00
Carlos Andrés	097350adb6	Hotfix sale_getProblems	2024-07-03 17:07:25 +02:00
Carlos Andrés	1ec7cd9540	Hotfix sale_getProblems	2024-07-03 16:59:01 +02:00
Sergio De la torre	1561e15d5e	feat roadmap refs #7195	2024-07-03 09:21:58 +02:00
Guillermo Bonet	edff15662c	Merge branch 'master' into test	2024-07-02 12:34:51 +02:00
Guillermo Bonet	028278ebcf	refs #6626 Hotfix	2024-07-02 11:52:25 +02:00
Guillermo Bonet	b6b3da0771	Merge branch 'test' into dev	2024-07-02 08:06:54 +02:00
Guillermo Bonet	a7c7c4c2f6	Merge pull request 'fix: refs #7552 Hotfix' (!2655) from 7552-itemGetSimilarFix into master ... Reviewed-on: #2655 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-02 05:35:52 +00:00
Sergio De la torre	1ca22dab92	Merge branch 'dev' into 7575_setParking_regExp	2024-07-01 14:36:18 +00:00
Guillermo Bonet	cafa7bce44	Merge branch 'test' into dev	2024-07-01 13:40:31 +02:00
Guillermo Bonet	a0ea742f9e	fix: refs #7486 Hotfix	2024-07-01 13:38:25 +02:00
Guillermo Bonet	8409ffa950	fix: refs #7552 Hotfix	2024-07-01 10:26:46 +02:00
Guillermo Bonet	2bf06d8add	fix: refs #7552 Hotfix	2024-07-01 10:06:34 +02:00
Sergio De la torre	3ad2346504	feat refactor setParking REGEXP refs #7575	2024-07-01 09:25:00 +02:00
Guillermo Bonet	57a879723e	Merge branch 'test' into dev	2024-07-01 07:39:19 +02:00
Guillermo Bonet	f73176375b	Merge pull request 'hotfix: refs #7640 multiple inventory' (!2645) from 7640-multipleInventory into master ... Reviewed-on: #2645 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-01 05:30:31 +00:00
Robert Ferrús	d4fba0a95f	Merge branch 'dev' into 7296-routesMonitorDropVirtualColumn	2024-06-28 11:49:08 +00:00
Guillermo Bonet	df4e5deae6	Merge branch 'test' into dev	2024-06-28 13:33:43 +02:00
Guillermo Bonet	08c9d43b17	refs #7486 Declare exit handler fix collection_assign error	2024-06-28 13:30:08 +02:00
Robert Ferrús	f1f57a388d	feat: refs #7296 drop column expeditionTruckFk	2024-06-28 08:45:18 +02:00
Guillermo Bonet	9164901eac	refs #7640 Requested changes	2024-06-27 13:26:59 +02:00
Sergio De la torre	746fa82f2a	feat expeditionPalletPrint refs #5210	2024-06-27 13:20:52 +02:00
Jorge Penadés	2b0df02f20	Merge branch 'dev' into 6286-setRightWorkerTimeControlAcls	2024-06-27 08:34:53 +00:00
Guillermo Bonet	e8dc6eafdc	refs #7640 multiple inventory	2024-06-27 10:18:43 +02:00
Jorge Penadés	1b7c7336af	fix: refs #6238 delete unused SQL script	2024-06-27 10:08:58 +02:00
Jorge Penadés	47a0cb6d4f	fix: refs #6238 insert ignore	2024-06-27 09:27:37 +02:00
Pablo Natek	b6a72a1abb	Merge branch 'master' into 6404-sendMailOnDeadLine	2024-06-27 07:12:40 +00:00
Guillermo Bonet	ad4dd088a3	Merge branch 'test' into dev	2024-06-26 11:58:43 +02:00
Guillermo Bonet	220f402f4e	Merge pull request 'horfix: ticket 197676' (!2640) from ticket197676-hotfix into master ... Reviewed-on: #2640 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-26 09:53:25 +00:00
Carlos Satorres	f9a09f3fec	Merge branch 'dev' into 7409-workerIncome	2024-06-26 08:00:58 +00:00
Guillermo Bonet	c4af92e9ba	horfix: ticket 197676	2024-06-26 09:54:51 +02:00
Pablo Natek	478a38b0ab	Merge branch 'master' into 6404-sendMailOnDeadLine	2024-06-26 05:14:37 +00:00
Pablo Natek	b23ff33e60	Merge branch 'dev' into 6021-floranet240624	2024-06-26 05:10:42 +00:00
Carlos Andrés	75486ae743	Hotfix ticketStateUpdate to ticket_setState	2024-06-25 19:47:22 +02:00
Carlos Andrés	5bcdc57978	Hotfix ticketStateUpdate to ticket_setState	2024-06-25 19:33:54 +02:00
Carlos Andrés	82118ae933	Hotfix ticketStateUpdate to ticket_setState	2024-06-25 19:30:59 +02:00
Jorge Penadés	93f2995d39	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls	2024-06-25 16:26:13 +02:00
Sergio De la torre	75f8de9277	Merge branch 'dev' into 7168-itemShelvingLog_get	2024-06-25 14:16:29 +00:00
Carlos Satorres	ffff851d1a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome	2024-06-25 14:49:32 +02:00
Guillermo Bonet	b9278f3b3a	Merge branch 'test' into dev	2024-06-25 14:02:16 +02:00
Guillermo Bonet	2e1ab3af20	refs #7486 Fix same assign collection	2024-06-25 14:00:46 +02:00
Sergio De la torre	e55af8d36f	feat itemShelvingLog refs #7168	2024-06-25 13:41:10 +02:00
Sergio De la torre	acf308fd16	feat itemShelvingLog refs #7168	2024-06-25 13:35:21 +02:00
Sergio De la torre	c551e229fb	feat itemShelvingLog refs #7168	2024-06-25 13:30:46 +02:00
Carlos Andrés	ff1918ef06	Merge pull request 'feat: previas con sitema de reservas refs #6861' (!2176) from 6861-Pasar-modo-trabajo-de-previa-a-reservas into dev ... Reviewed-on: #2176 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-25 11:21:02 +00:00
Alex Moreno	dbab56a566	Merge branch 'dev' into 7406-workerFormation	2024-06-25 11:15:02 +00:00
Alex Moreno	85854e0713	warmFix: use vn	2024-06-25 13:14:44 +02:00