22632 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	57a879723e	Merge branch 'test' into dev	2024-07-01 07:39:19 +02:00
Guillermo Bonet	e33b8893f6	Merge branch 'master' into test	2024-07-01 07:38:55 +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	cc3dab1007	Merge pull request '7296-routesMonitorDropVirtualColumn' (!2648) from 7296-routesMonitorDropVirtualColumn into dev ... Reviewed-on: #2648 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-07-01 05:22:00 +00:00
Javi Gallego	355e426ccf	mail-alias-account con mixin	2024-07-01 07:19:00 +02:00
Guillermo Bonet	85c7336d92	refs #7644 Minor changes	2024-06-28 14:52:19 +02: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
Jon Elias	264d5b4b9a	Merge pull request '#5447 warehouse out filter' (!2500) from 5447-TravelExtraCommunity into dev ... Reviewed-on: #2500 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-28 11:21:10 +00:00
Jon Elias	0917fc318a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5447-TravelExtraCommunity	2024-06-28 13:19:38 +02:00
Guillermo Bonet	19bf606330	refs #7644 First commit	2024-06-28 12:57:27 +02:00
Pablo Natek	8e7cfb6391	Merge pull request 'fix: refs #6404 get label' (!2649) from 6404-fixtGetLabel into master ... Reviewed-on: #2649 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-28 07:19:51 +00:00
Pablo Natek	94a73294cb	fix: refs #6404 get label	2024-06-28 09:11:20 +02:00
Robert Ferrús	ca3750ebac	feat: refs #7296	2024-06-28 08:46:54 +02:00
Robert Ferrús	f1f57a388d	feat: refs #7296 drop column expeditionTruckFk	2024-06-28 08:45:18 +02:00
Sergio De la torre	8246eb51d4	Merge pull request 'feat expeditionPalletPrint refs #5210' (!2647) from 5210_expeditionPalletPrint into dev ... Reviewed-on: #2647 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-27 13:48:34 +00: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	7af2ae80b7	Merge pull request '#6286 set right workerTimeControl acls' (!2557) from 6286-setRightWorkerTimeControlAcls into dev ... Reviewed-on: #2557 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-27 08:50:09 +00:00
Jorge Penadés	2b0df02f20	Merge branch 'dev' into 6286-setRightWorkerTimeControlAcls	2024-06-27 08:34:53 +00:00
Jorge Penadés	4814151b15	Merge pull request '#6238 drop duplicate script' (!2644) from 6238-fix-duplicateRecords into dev ... Reviewed-on: #2644 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-27 08:19:46 +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
Pablo Natek	eade4b55e5	Merge pull request 'feat: refs #6404 add mail notification' (!2566) from 6404-sendMailOnDeadLine into master ... Reviewed-on: #2566 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-27 08:00:48 +00: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
Jorge Penadés	cdcb347b05	Merge pull request 'fix: refs 197934 add alias' (!2643) from 195937-hotfix-addAlias into master ... Reviewed-on: #2643 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-26 15:25:14 +00:00
Jorge Penadés	0da6d633fd	fix: refs 197934 add alias	2024-06-26 17:21:22 +02:00
Sergio De la torre	cbc00b90b9	feat front-reservas refs #6861	2024-06-26 14:02:25 +02:00
Alex Moreno	26ca72cc00	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-26 12:25:19 +02:00
Alex Moreno	cca62ae902	feat: return sql check error	2024-06-26 12:25:18 +02: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	90d23fc1a4	Merge pull request '7409-workerIncome' (!2597) from 7409-workerIncome into dev ... Reviewed-on: #2597 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-26 09:38:01 +00:00
Carlos Andrés	e75682e4d9	Merge pull request 'Hotfix-Ticket-197488-clonar-turnos' (!2638) from Hotfix-Ticket-197488-clonar-turnos into master ... Reviewed-on: #2638 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-26 09:33:18 +00:00
Robert Ferrús	ded7a5391f	Merge pull request 'fix: refs #7039 filterFix' (!2639) from 7039-hotFixFilterCountry into master ... Reviewed-on: #2639 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-06-26 08:24:59 +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
Robert Ferrús	0534526ac2	fix: refs #7039 filterFix	2024-06-26 09:03:06 +02:00
Pako Natek	8aea57e8f9	Merge pull request 'version 240625' (!2637) from 6021-floranet240624 into dev ... Reviewed-on: #2637 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-06-26 05:40:18 +00: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	1f6fd8d6d1	feat: refs #6286 check if is teamBoss	2024-06-25 17:27:00 +02:00
Sergio De la torre	b47637610b	Merge pull request 'feat: refs #7168 Added vRecords param in proc' (!2305) from 7168-itemShelvingLog_get into dev ... Reviewed-on: #2305 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-25 14:26:21 +00: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